Merge branch 'jng' into dev

api/accountFiee/accountFiee.pb.go

@@ -1195,6 +1195,8 @@ type UserListRequest struct {
 	Ids           []int64                `protobuf:"varint,11,rep,packed,name=ids,proto3" json:"ids"`
 	Nationality   string                 `protobuf:"bytes,12,opt,name=nationality,proto3" json:"nationality"`
 	NameAndNumber string                 `protobuf:"bytes,13,opt,name=nameAndNumber,proto3" json:"nameAndNumber"`
+	Email         string                 `protobuf:"bytes,14,opt,name=email,proto3" json:"email"`
+	AbroadTel     string                 `protobuf:"bytes,15,opt,name=abroadTel,proto3" json:"abroadTel"`
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
@@ -1320,6 +1322,20 @@ func (x *UserListRequest) GetNameAndNumber() string {
 	return ""
 }
 
+func (x *UserListRequest) GetEmail() string {
+	if x != nil {
+		return x.Email
+	}
+	return ""
+}
+
+func (x *UserListRequest) GetAbroadTel() string {
+	if x != nil {
+		return x.AbroadTel
+	}
+	return ""
+}
+
 type UserInfoResponse struct {
 	state              protoimpl.MessageState `protogen:"open.v1"`
 	Id                 uint64                 `protobuf:"varint,1,opt,name=id,proto3" json:"id"`
@@ -10377,7 +10393,7 @@ const file_api_accountFiee_accountFiee_proto_rawDesc = "" +
 	"\x11AbroadTelAreaCode\x18\x19 \x01(\tR\x11AbroadTelAreaCode\x12\x1c\n" +
 	"\tAbroadTel\x18\x1a \x01(\tR\tAbroadTel\x12 \n" +
 	"\vinviterName\x18\x1b \x01(\tR\vinviterName\x12 \n" +
-	"\vinviterCode\x18\x1c \x01(\tR\vinviterCode\"\xff\x02\n" +
+	"\vinviterCode\x18\x1c \x01(\tR\vinviterCode\"\xb3\x03\n" +
 	"\x0fUserListRequest\x12\x16\n" +
 	"\x06domain\x18\x01 \x01(\tR\x06domain\x12\x16\n" +
 	"\x06subNum\x18\x02 \x01(\tR\x06subNum\x12$\n" +
@@ -10392,7 +10408,9 @@ const file_api_accountFiee_accountFiee_proto_rawDesc = "" +
 	" \x01(\tR\vblurNameTel\x12\x10\n" +
 	"\x03ids\x18\v \x03(\x03R\x03ids\x12 \n" +
 	"\vnationality\x18\f \x01(\tR\vnationality\x12$\n" +
-	"\rnameAndNumber\x18\r \x01(\tR\rnameAndNumber\"\x92\x06\n" +
+	"\rnameAndNumber\x18\r \x01(\tR\rnameAndNumber\x12\x14\n" +
+	"\x05email\x18\x0e \x01(\tR\x05email\x12\x1c\n" +
+	"\tabroadTel\x18\x0f \x01(\tR\tabroadTel\"\x92\x06\n" +
 	"\x10UserInfoResponse\x12\x0e\n" +
 	"\x02id\x18\x01 \x01(\x04R\x02id\x12\x16\n" +
 	"\x06status\x18\x02 \x01(\x05R\x06status\x12\x12\n" +

api/accountFiee/accountFiee.proto

@@ -220,6 +220,8 @@ message UserListRequest{
   repeated int64 ids = 11;
   string nationality = 12;
   string nameAndNumber = 13;
+  string email = 14;
+  string abroadTel = 15;
 }
 message UserInfoResponse{
   uint64 id = 1;

pkg/service/account/account.go

@@ -36,7 +36,7 @@ func UserExcelDownload(c *gin.Context) {
 		return
 	}
 	titleList := []string{
-		"用户编号", "姓名", "性别", "国籍", "手机号", "证件类型", "有效期至", "证件号码", "出生日期", "年龄", "现所在地", "注册时间", "审核时间", "审核状态", "不通过备注",
+		"用户编号", "姓名", "性别", "国籍", "手机号", "证件类型", "有效期至", "证件号码", "出生日期", "年龄", "现所在地", "注册时间", "审核时间", "审核状态", "不通过备注", "非大陆手机号", "邮箱",
 	}
 	var dataList []interface{}
 
@@ -59,6 +59,8 @@ func UserExcelDownload(c *gin.Context) {
 			i.AuditTime,
 			Status,
 			i.NotPassRemarks,
+			i.AbroadTelAreaCode + i.AbroadTel,
+			i.Email,
 		}
 		dataList = append(dataList, &data)
 	}