From 599cb3a300878dc8b3a579f967fbad4a7eb536e7 Mon Sep 17 00:00:00 2001
From: Andru <769883346@qq.com>
Date: 星期五, 27 十月 2023 16:07:48 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java | 64 +++++++-------------------------
1 files changed, 14 insertions(+), 50 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java
index 857707f..eae2439 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java
@@ -1,10 +1,8 @@
package com.hz.his.dto.user;
-import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.ToString;
-import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@@ -14,36 +12,16 @@
*/
@Data
@ToString
-public class UserParamDto {
+public class UserParamDto extends UserBaseInfoDto {
+
/** 鏉ユ簮淇℃伅 */
private UserUnionDto userUnion;
- /** 鐢ㄦ埛id */
- private String userId;
- /** 濮撳悕 */
- private String name;
- /** 涓荤數璇濆彿鐮� */
- private String tel;
- /** 鍥剧墖 */
- private String imgUrl;
/** 浼氬憳绛夌骇 */
private String userLevel;
/** 鏄熺骇,100涓�1鏄燂紝150涓�1.5鏄� */
private Integer starLevel;
- /** 鐢ㄦ埛绫诲瀷 */
- private String userType;
-
- /** 娓犻亾鏉ユ簮绫诲瀷 */
- private String channelCategory= CATEGORY_ONESELF;
- /** 鏉ユ簮id */
- private String channelId;
- /** 鏉ユ簮 */
- private String channelType;
- /** 浜岀骇鏉ユ簮id */
- private String channel2Id;
- /** 浜岀骇鏉ユ簮 */
- private String channelType2;
/** 鍓笭閬撴爣璇� */
private String channelAssistId;
@@ -56,14 +34,10 @@
/** QQ */
private String QQ;
- /** 鎬у埆 */
- private Integer gender = SEX_WUMAN;
/** CIQ */
private String CIQ;
/** 浼氬憳鍙� */
private String memberNO;
- /** 澶囨敞 */
- private String remark;
/** 娑堣垂閲戦 */
private String money;
@@ -72,43 +46,26 @@
/** 涓婁竴娆￠绾︾殑椤鹃棶 */
private String lastCorpUserId;
- /** 璇佷欢绫诲瀷 */
- private Integer certificateType;
- /** 璇佷欢缂栧彿 */
- private String certificateNo;
- /** 鐢熸棩yyyy-MM-dd" */
- private String birthDay;
-
/** 宸ヤ綔浜哄憳Id */
private String corpUserId;
/** 鎺ュ彛id */
private String apiId;
- /** 鎵�灞為【闂�(閿�鍞【闂�) */
- private String hisCorpUserId;
/** 瀹㈡埛寮�鍙戜汉鍛樺伐id */
private String customerDeveloperId;
- /** 鎵�灞為棬搴梚d */
- private String shopId;
/** 鐢ㄦ埛瑙掕壊 */
private Integer userRole;
/** 鎷奸煶鐮�*/
private String pinyinCode;
- /** 鐢电綉鍜ㄨ椤鹃棶 */
- private String internetCorpUserId;
/** 鎵�灞炵編瀹瑰笀*/
private String beauticianCorpUserId;
- /** 瀹㈡湇涓撳憳 */
- private String chatCorpUserId;
/** 鍜ㄨ鍔╃悊 */
private String consultCorpUserId;
/** 鍏变韩瀹㈡埛 */
private Integer shareCustomer = 0;
/** 鎵�灞炴姢澹� */
private String nurseCorpUserId;
- /** 鎵�灞炲尰鐢� */
- private String doctorCorpUserId;
/** 鍜ㄨ甯堥毝灞� */
private String consultBelonging;
@@ -117,7 +74,7 @@
/** 璇█绫诲瀷鍚嶇О */
private String languageTypeName;
/** 鐢ㄦ埛骞撮緞 */
- private Integer year = 0;
+ private Integer year;
/** 鏄熷骇绫诲瀷鍚嶇О */
private String constellationTypeName;
@@ -148,8 +105,6 @@
private String userInterestsJson;
/** 绉戝鍏崇郴json */
private String departmentJson;
- /** 鐢ㄦ埛鍦板潃 json */
- private String addressJson;
/** 娆¤鐢佃瘽绨� json */
private String phoneBooksJson;
@@ -169,8 +124,6 @@
/** 鏇存柊鏃堕棿 */
private Date updateTime;
- /** 閭�璇蜂汉id 鐢ㄦ埛锛屽憳宸� */
- private String inviteeId;
/** 鎬у埆0鏈煡1鐢�2濂� */
private Integer sex;
/** 浼氬憳鍚嶇О */
@@ -201,6 +154,17 @@
private String opId;
//淇敼鎿嶄綔鐨勫娉�
private String note;
+ /** 鎬у埆0鏈煡1鐢�2濂� */
+ private Integer gender;
+
+ /**鏄惁杞瘖*/
+ private Integer isTransfer;
+ /**杞瘖淇℃伅*/
+ private UserTransferDto transferRecord;
+
+ /**涓昏璇夋眰**/
+ private String mainAppeal;
+ private String minorAppeal;
public UserParamDto() {
}
--
Gitblit v1.8.0