From f41afc204087959897d8fe993d8965d2346be67c Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期二, 01 八月 2023 16:53:30 +0800
Subject: [PATCH] Merge branch 'fhx-prod-用户建档' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/user/pretriage/UserPretriageInfoDto.java    |  219 +++++++++++++++++++
 phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java                      |  165 +++-----------
 phis-feign/src/main/java/com/hz/his/dto/user/pretriage/UserPretriageLabelDto.java   |   27 ++
 phis-feign/src/main/java/com/hz/his/dto/user/pretriage/UserPretriageProjectDto.java |   47 ++++
 phis-feign/src/main/java/com/hz/his/dto/user/UserBaseInfoDto.java                   |  115 ++++++++++
 phis-feign/src/main/java/com/hz/his/dto/user/other/OtherUserInformationDto.java     |   60 +++++
 6 files changed, 503 insertions(+), 130 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserBaseInfoDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserBaseInfoDto.java
new file mode 100644
index 0000000..1409797
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserBaseInfoDto.java
@@ -0,0 +1,115 @@
+package com.hz.his.dto.user;
+
+
+import com.hz.his.dto.user.other.OtherUserInformationDto;
+import com.hz.his.dto.user.pretriage.UserPretriageInfoDto;
+import lombok.Data;
+
+/**
+ * 鐢ㄦ埛寤烘。鏃朵俊鎭痙to
+ * author:andru
+ * Date:2021/12/8 16:03
+ */
+@Data
+public class UserBaseInfoDto {
+
+    /** 鐢ㄦ埛id */
+    private String userId;
+    /** 鍒涘缓浜� */
+    private String createPersonId;
+
+    //寤烘。鎵�闇�鍙傛暟
+    //鍩虹淇℃伅------------
+    /** 濮撳悕 */
+    private String name;
+    /** 璇佷欢绫诲瀷 */
+    private Integer certificateType;
+    /** 璇佷欢缂栧彿 */
+    private String certificateNo;
+    /** 鎬у埆 */
+    private Integer gender = SEX_WUMAN;
+    /** 涓荤數璇濆彿鐮� */
+    private String tel;
+    /** 瀹㈡埛绫诲瀷 */
+    private String userType;
+
+    /** 鎵�灞為棬搴梚d */
+    private String shopId;
+
+    /** 娓犻亾鏉ユ簮绫诲瀷 */
+    private String channelCategory= CATEGORY_ONESELF;
+    /** 鏉ユ簮id */
+    private String channelId;
+    /** 鏉ユ簮 */
+    private String channelType;
+    /** 浜岀骇鏉ユ簮id */
+    private String channel2Id;
+    /** 浜岀骇鏉ユ簮 */
+    private String channelType2;
+
+    /** 閭�璇蜂汉id  鐢ㄦ埛锛屽憳宸� */
+    private String inviteeId;
+    /** 鎵�灞為【闂�(閿�鍞【闂�) */
+    private String hisCorpUserId;
+    /** 鐢电綉鍜ㄨ椤鹃棶(鎵�灞濼MK) */
+    private String internetCorpUserId;
+    /** 涓昏瘖鍖荤敓 */
+    private String doctorCorpUserId;
+    // 瀹㈡湇涓撳憳
+    private String chatCorpUserId;
+
+    //涓婁紶鍥剧墖
+    /** 鍥剧墖 */
+    private String imgUrl;
+
+    //鍏朵粬淇℃伅
+    /** 鐢熸棩yyyy-MM-dd" */
+    private String birthDay;
+    //鍥藉
+    private String country;
+    //鍦板潃绫诲瀷(鍗曚綅銆佸叕鍙搞�佷釜浜�)
+    private Integer addressType;
+    //鐪佷唤
+    private String province;
+    //甯�
+    private String city;
+    //鍖�
+    private String area;
+    //璇︾粏鍦板潃
+    private String address;
+    /** 鐢ㄦ埛鍦板潃 json */
+    private String addressJson;
+    // 澶囨敞
+    private String remark;
+
+    //棰勫垎璇婂崱瀵硅薄
+    private UserPretriageInfoDto userPretriageInfoDto;
+
+    //鐧昏鎿嶄綔-------------------------------------
+    //琛ユ。-鍛樺伐鏍囪瘑
+    private String employeeId;
+    //鐧昏瀵硅薄
+    private OtherUserInformationDto otherUserInformation;
+
+
+    //--------------------------------------------------
+
+    public UserBaseInfoDto() {
+    }
+
+    /**鎬у埆-鏈煡*/
+    public static final Integer SEX_UNKNOWN = 0;
+    /**鎬у埆-鐢�*/
+    public static final Integer SEX_MAN = 1;
+    /**鎬у埆-濂�*/
+    public static final Integer SEX_WUMAN = 2;
+
+    /**娓犻亾绫诲埆-娓犻亾*/
+    public static final String CATEGORY_CHANNEL = "channel";
+    /**娓犻亾绫诲埆-浼氬憳*/
+    public static final String CATEGORY_MEMBERS = "members";
+    /**娓犻亾绫诲埆-鍛樺伐*/
+    public static final String CATEGORY_EMPLOYEE = "employee";
+    /**娓犻亾绫诲埆-鑷繁鏉�*/
+    public static final String CATEGORY_ONESELF = "oneself";
+}
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 5a20166..4bca9ee 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,214 +12,122 @@
  */
 @Data
 @ToString
-public class UserParamDto {
+public class UserParamDto extends UserBaseInfoDto {
 
-    /** 鐢ㄦ埛id */
-    private String userId;
-
-    /** 濮撳悕 */
-    private String name;
-
-    /** 涓荤數璇濆彿鐮� */
-    private String tel;
 
     /** 鏉ユ簮淇℃伅 */
     private UserUnionDto userUnion;
 
-    /** 鍥剧墖 */
-    private String imgUrl;
-
     /** 浼氬憳绛夌骇 */
     private String userLevel;
-
     /** 鏄熺骇,100涓�1鏄燂紝150涓�1.5鏄� */
     private Integer starLevel;
 
-    /** 鐢ㄦ埛绫诲瀷 */
-    private String userType;
-
-    /** 鏉ユ簮id */
-    private String channelId;
-
-    /** 鏉ユ簮 */
-    private String channelType;
-
-    /** 浜岀骇鏉ユ簮id */
-    private String channel2Id;
-
-    /** 浜岀骇鏉ユ簮 */
-    private String channelType2;
+    /** 鍓笭閬撴爣璇� */
+    private String channelAssistId;
+    /** 鍓笭閬撳悕绉� */
+    private String channelAssistName;
+    /** 鍓笭閬撲簩绾ф爣璇�,鏈骇 */
+    private String channelAssist2Id;
+    /** 鍓笭閬撲簩绾ф潵婧�,鏈骇 */
+    private String channelAssist2Name;
 
     /** QQ */
     private String QQ;
-
-    /** 鎬у埆 */
-    private Integer gender = SEX_WUMAN;
-
     /** CIQ */
     private String CIQ;
-
     /** 浼氬憳鍙� */
     private String memberNO;
 
-    /** 澶囨敞 */
-    private String remark;
-
     /** 娑堣垂閲戦 */
     private String money;
-
     /** 涓婁竴娆¢绾︾殑鍖荤敓 */
     private String lastDoctorId;
-
     /** 涓婁竴娆¢绾︾殑椤鹃棶 */
     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;
 
     /** 鍥藉绫诲瀷鍚嶇О */
     private String countryTypeName;
-
     /** 璇█绫诲瀷鍚嶇О */
     private String languageTypeName;
-
     /** 鐢ㄦ埛骞撮緞 */
     private Integer year = 0;
 
     /** 鏄熷骇绫诲瀷鍚嶇О */
     private String constellationTypeName;
-
     /** 姘戞棌绫诲瀷鍚嶇О */
     private String nationalityTypeName;
-
     /** 鑱屼笟绫诲瀷鍚嶇О */
     private String professionTypeName;
-
     /** 鏀跺叆绫诲瀷鍚嶇О */
     private String incomeTypeName;
-
     /** 濠氬Щ绫诲瀷鍚嶇О */
     private String marriageTypeName;
-
     /** 鐢熻偛绫诲瀷鍚嶇О */
     private String growthTypeName;
-
     /** 绫嶈疮绫诲瀷鍚嶇О */
     private String nativePlaceTypeName;
-
     /** 鍗曚綅鍚嶇О */
     private String unitName;
-
     /** 娉婅溅闇�姹� */
     private Integer isHaveCar = 0;
-
     /** 杞︾墝鍙风爜 */
     private String carNumber;
 
     /** 杩囨晱鏍囩 */
     private String allergyLabel;
-
     /** 鍗拌薄鏍囩 json */
     private String impressionLabelJson;
-
     /** 鐢ㄦ埛鍏磋叮鐖卞ソjson */
     private String userInterestsJson;
-
     /** 绉戝鍏崇郴json */
     private String departmentJson;
-
-    /** email */
-    private String email;
-
-    /** 鍟嗗姟閫氱紪鍙� */
-    private String merchantNo;
-
-    /** 鍥哄畾鐢佃瘽 */
-    private String telPhone;
-
-    /** wechat */
-    private String wechat;
-
-    /** Line */
-    private String line;
-
-    /** 鑱旂粶鏂瑰紡 */
-    private String contactType;
-
-    /** 鐢ㄦ埛鍦板潃 json */
-    private String addressJson;
-
     /** 娆¤鐢佃瘽绨� json */
     private String phoneBooksJson;
 
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    /** email */
+    private String email;
+    /** 鍟嗗姟閫氱紪鍙� */
+    private String merchantNo;
+    /** 鍥哄畾鐢佃瘽 */
+    private String telPhone;
+    /** wechat */
+    private String wechat;
+    /** Line */
+    private String line;
+    /** 鑱旂粶鏂瑰紡 */
+    private String contactType;
+
+
     /** 鏇存柊鏃堕棿 */
     private Date updateTime;
-
-    /** 閭�璇蜂汉id  鐢ㄦ埛锛屽憳宸� */
-    private String inviteeId;
-
-    /** 娓犻亾鏉ユ簮绫诲瀷 */
-    private String channelCategory= CATEGORY_ONESELF;
-
     /** 鎬у埆0鏈煡1鐢�2濂� */
     private Integer sex;
-
     /** 浼氬憳鍚嶇О */
     private String memberLevel;
-
     /** 鎼滅储锛氬仛杩囬」鐩� */
     private String projectName;
 
@@ -230,13 +136,24 @@
     /** 閮ㄩ棬id */
     private String department;
 
-
     /** 鐢ㄦ埛娑堣垂鏃堕棿锛堝紑濮嬶級锛屾牸寮忥細yyyy-MM-dd HH:mm:ss */
     private String consumeStartTime;
     /** 鎼滅储锛氱敤鎴峰垱寤烘椂闂达紙寮�濮嬶級锛屾牸寮忥細yyyy-MM-dd HH:mm:ss */
     private String createStartTime;
     /** 鎼滅储锛氱敤鎴峰垱寤烘椂闂达紙缁撴潫锛夛紝鏍煎紡锛歽yyy-MM-dd HH:mm:ss */
     private String createEndTime;
+
+    /*鐢ㄦ埛娉ㄥ唽鎺ㄨ崘浜篿d*/
+    private String referrerId;
+    /*鍚屾棰嗗缓鐨勫弬鏁�*/
+    private boolean internal;
+
+    //淇敼鎿嶄綔浜哄悕绉�
+    private String opMan;
+    //淇敼鎿嶄綔浜烘爣璇�
+    private String opId;
+    //淇敼鎿嶄綔鐨勫娉�
+    private String note;
 
     public UserParamDto() {
     }
@@ -257,19 +174,7 @@
     /**娓犻亾绫诲埆-鑷繁鏉�*/
     public static final String CATEGORY_ONESELF = "oneself";
 
-    /*鐢ㄦ埛娉ㄥ唽鎺ㄨ崘浜篿d*/
-    private String referrerId;
-    /*鍚屾棰嗗缓鐨勫弬鏁�*/
-    private boolean internal;
 
-    //淇敼鎿嶄綔浜哄悕绉�
-    private String opMan;
-
-    //淇敼鎿嶄綔浜烘爣璇�
-    private String opId;
-
-    //淇敼鎿嶄綔鐨勫娉�
-    private String note;
 
 
 
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/other/OtherUserInformationDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/other/OtherUserInformationDto.java
new file mode 100644
index 0000000..85936bf
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/other/OtherUserInformationDto.java
@@ -0,0 +1,60 @@
+package com.hz.his.dto.user.other;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 浼氬憳鐧昏-琛ユ。dto
+ * @USER: fhx
+ * @DATE: 2023/8/1
+ **/
+@Data
+public class OtherUserInformationDto {
+
+    /** Id */
+    private String id;
+    /** 鐢ㄦ埛Id */
+    private String userId;
+    /** 鐧昏浜哄憳宸� */
+    private String operateName;
+    /** 鏇存柊鏃堕棿 */
+    private Date updateTime=new Date();
+
+    /** 鐢ㄦ埛鏍囩,澶氫釜鐢ㄩ�楀彿闅斿紑 */
+    private String userTag;
+    /** 鐢ㄦ埛杞︾墝淇℃伅 */
+    private String licensePlate;
+    /** 楗涔犳儻 */
+    private String eatingHabits;
+    /** 琛ユ。澶囨敞 */
+    private String remark;
+
+    /** 鍦板潃 */
+    private String address;
+    /** 鐪� */
+    private String province;
+    /** 甯� */
+    private String city;
+    /** 鍖� */
+    private String area;
+    /** 鐢ㄦ埛hisId */
+    private String hisId;
+
+    //鏈煡浣滅敤瀛楁
+    /** 鎵�灞為棬搴� */
+    private String shopId;
+    /** 鎵�灞炲鏈� */
+    private String chatCorpUserId;
+    /** 鐢电綉鍜ㄨ椤鹃棶(TMK) */
+    private String internetCorpUserId;
+    /** 鍥剧墖璺緞 */
+    private String imageUrl;
+    /** 鐢ㄦ埛鎵�灞炲尰鐢烮D */
+    private String doctorCorpUserId;
+    /** 鐢ㄦ埛鎵�灞炲尰鐢熷悕绉� */
+    private String doctorCorpUserName;
+
+    public OtherUserInformationDto() {
+    }
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/pretriage/UserPretriageInfoDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/pretriage/UserPretriageInfoDto.java
new file mode 100644
index 0000000..e0866b0
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/pretriage/UserPretriageInfoDto.java
@@ -0,0 +1,219 @@
+package com.hz.his.dto.user.pretriage;
+
+
+import java.util.List;
+
+/**
+ * 鐢ㄦ埛棰勫垎璇婂崱淇℃伅
+ */
+public class UserPretriageInfoDto {
+
+    //id
+    private String id;
+    //鐢ㄦ埛ID
+    private String userId;
+    //鍜ㄨ闂ㄥ簵ID
+    private String shopId;
+    //鍜ㄨ闂ㄥ簵鍚嶇О
+    private String shopName;
+    //鍖荤敓ID
+    private String doctorId;
+    //鍖荤敓鍚嶇О
+    private String doctorName;
+    //绾夸笂璁㈠崟
+    private String onlineOrderDec;
+    //鍜ㄨ璇︽儏
+    private String consultDetail;
+    //娌荤枟鍙�
+    private String treatHistory;
+    //娌荤枟鎺ㄨ崘鍐呭
+    private String treatRecommendDec;
+    //鐗规畩鎯呭喌
+    private String specialDec;
+    //鍒涘缓浜篿d
+    private String createUserId;
+    //鍒涘缓浜哄悕绉�
+    private String createName;
+    //鍖荤敓鍚嶇О
+    private String keyWord;
+
+
+    //椤圭洰list
+    private List<UserPretriageProjectDto> pretriageProjectList;
+    //鏍囩list
+    private List<UserPretriageLabelDto>pretriageLabelList;
+
+    //棰勭害鍗旾D
+    private String appointmentId;
+    //椤鹃棶ID
+    private String corpUserId;
+
+    //鏌ヨ娌荤枟鎺ㄨ崘鏂规
+    private List<String> projectIds;
+    private List<String> labelIds;
+
+
+
+    public UserPretriageInfoDto() {
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getShopId() {
+        return shopId;
+    }
+
+    public void setShopId(String shopId) {
+        this.shopId = shopId;
+    }
+
+    public String getShopName() {
+        return shopName;
+    }
+
+    public void setShopName(String shopName) {
+        this.shopName = shopName;
+    }
+
+    public String getDoctorId() {
+        return doctorId;
+    }
+
+    public void setDoctorId(String doctorId) {
+        this.doctorId = doctorId;
+    }
+
+    public String getDoctorName() {
+        return doctorName;
+    }
+
+    public void setDoctorName(String doctorName) {
+        this.doctorName = doctorName;
+    }
+
+    public String getOnlineOrderDec() {
+        return onlineOrderDec;
+    }
+
+    public void setOnlineOrderDec(String onlineOrderDec) {
+        this.onlineOrderDec = onlineOrderDec;
+    }
+
+    public String getConsultDetail() {
+        return consultDetail;
+    }
+
+    public void setConsultDetail(String consultDetail) {
+        this.consultDetail = consultDetail;
+    }
+
+    public String getTreatHistory() {
+        return treatHistory;
+    }
+
+    public void setTreatHistory(String treatHistory) {
+        this.treatHistory = treatHistory;
+    }
+
+    public String getTreatRecommendDec() {
+        return treatRecommendDec;
+    }
+
+    public void setTreatRecommendDec(String treatRecommendDec) {
+        this.treatRecommendDec = treatRecommendDec;
+    }
+
+    public String getSpecialDec() {
+        return specialDec;
+    }
+
+    public void setSpecialDec(String specialDec) {
+        this.specialDec = specialDec;
+    }
+
+    public String getCreateUserId() {
+        return createUserId;
+    }
+
+    public void setCreateUserId(String createUserId) {
+        this.createUserId = createUserId;
+    }
+
+    public String getCreateName() {
+        return createName;
+    }
+
+    public void setCreateName(String createName) {
+        this.createName = createName;
+    }
+
+    public String getKeyWord() {
+        return keyWord;
+    }
+
+    public void setKeyWord(String keyWord) {
+        this.keyWord = keyWord;
+    }
+
+    public List<UserPretriageProjectDto> getPretriageProjectList() {
+        return pretriageProjectList;
+    }
+
+    public void setPretriageProjectList(List<UserPretriageProjectDto> pretriageProjectList) {
+        this.pretriageProjectList = pretriageProjectList;
+    }
+
+    public List<UserPretriageLabelDto> getPretriageLabelList() {
+        return pretriageLabelList;
+    }
+
+    public void setPretriageLabelList(List<UserPretriageLabelDto> pretriageLabelList) {
+        this.pretriageLabelList = pretriageLabelList;
+    }
+
+    public String getAppointmentId() {
+        return appointmentId;
+    }
+
+    public void setAppointmentId(String appointmentId) {
+        this.appointmentId = appointmentId;
+    }
+
+    public String getCorpUserId() {
+        return corpUserId;
+    }
+
+    public void setCorpUserId(String corpUserId) {
+        this.corpUserId = corpUserId;
+    }
+
+    public List<String> getProjectIds() {
+        return projectIds;
+    }
+
+    public void setProjectIds(List<String> projectIds) {
+        this.projectIds = projectIds;
+    }
+
+    public List<String> getLabelIds() {
+        return labelIds;
+    }
+
+    public void setLabelIds(List<String> labelIds) {
+        this.labelIds = labelIds;
+    }
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/pretriage/UserPretriageLabelDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/pretriage/UserPretriageLabelDto.java
new file mode 100644
index 0000000..27dc23c
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/pretriage/UserPretriageLabelDto.java
@@ -0,0 +1,27 @@
+package com.hz.his.dto.user.pretriage;
+
+import lombok.Data;
+
+/**
+ * 鐢ㄦ埛棰勫垎璇婂崱鏍囩
+ */
+@Data
+public class UserPretriageLabelDto {
+
+    /** 鐢ㄦ埛棰勫垎璇婂崱淇℃伅Id */
+    private String userPretriageCardId;
+    /** 鍒嗙被鏍囩ID(BaseClassify涓婚敭ID) */
+    private String labelId;
+    /** 鍒嗙被鏍囩鐖剁被ID(BaseClassify-parentId) */
+    private String labelParentId;
+
+
+    public UserPretriageLabelDto() {
+    }
+
+    public UserPretriageLabelDto(String userPretriageCardId, String labelId, String labelParentId) {
+        this.userPretriageCardId = userPretriageCardId;
+        this.labelId = labelId;
+        this.labelParentId = labelParentId;
+    }
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/pretriage/UserPretriageProjectDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/pretriage/UserPretriageProjectDto.java
new file mode 100644
index 0000000..628e440
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/pretriage/UserPretriageProjectDto.java
@@ -0,0 +1,47 @@
+package com.hz.his.dto.user.pretriage;
+
+import lombok.Data;
+
+/**
+ * 鐢ㄦ埛棰勫垎璇婂崱淇℃伅鍏宠仈椤圭洰
+ */
+@Data
+public class UserPretriageProjectDto {
+
+    /** 鐢ㄦ埛棰勫垎璇婂崱淇℃伅Id */
+    private String userPretriageCardId;
+    /** 椤圭洰Id */
+    private String projectId;
+    /** spuName */
+    private String spuName;
+
+    //---闈炶〃瀛楁
+    private String name;
+
+
+    public UserPretriageProjectDto() {
+    }
+
+    public UserPretriageProjectDto(String userPretriageCardId, String projectId, String spuName) {
+        this.userPretriageCardId = userPretriageCardId;
+        this.projectId = projectId;
+        this.spuName = spuName;
+    }
+
+    public String getUserPretriageCardId() {
+        return userPretriageCardId;
+    }
+
+    public void setUserPretriageCardId(String userPretriageCardId) {
+        this.userPretriageCardId = userPretriageCardId;
+    }
+
+    public String getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
+}

--
Gitblit v1.8.0