From 6916fa719c08411cd70f8e96514eeca129274689 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期三, 06 三月 2024 19:03:07 +0800
Subject: [PATCH] Merge branch 'fhx-prod-FDD' into master-test

---
 phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java |   45 +++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java b/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
index a04cc54..e3bc63e 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
+++ b/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
@@ -1,16 +1,22 @@
 package com.hz.phis.dt.user;
 
+import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
+import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
-/**鏌ヨ鐢ㄦ埛璇︽儏鏁版嵁*/
+/**鐢ㄦ埛璇︽儏鏁版嵁杩斿洖瀹炰綋*/
 @Data
 public class UserDt {
-
+    /**鏍囪瘑*/
     private String id;
+    /**ciq浼氬憳鍙�*/
     private String CIQ;
+    /**鍚嶇О*/
     private String name;
+    /**鎵嬫満鍙�*/
     private String tel;
     /**鐢熸棩yyyy-MM-dd*/
     private String birthDay;
@@ -46,8 +52,43 @@
     private String channelCategory;
     /**鎵�灞為棬搴�*/
     private String shopId;
+    /**鎵�灞為棬搴楀悕绉�*/
+    private String shopName;
     /**鐢ㄦ埛瑙掕壊*/
     private String userRole;
     /**鐢ㄦ埛绫诲瀷*/
     private String userType;
+    /**鎵�灞為【闂�(閿�鍞【闂�)*/
+    private String hisCorpUserId;
+    /**鎵�灞為【闂�(閿�鍞【闂�)*/
+    private String hisCorpUser;
+    /**鎬у埆*/
+    private Integer gender;
+    /**鑱屼笟绫诲瀷鍚嶇О*/
+    private String professionTypeName;
+    /**寰俊鍙�*/
+    private String wechat;
+    /**閭*/
+    private String email;
+    /**澶村儚*/
+    private String imgUrl;
+    private String hisId;
+    private String userBelongingType;
+     //鐢电綉鍜ㄨ椤鹃棶(TMK) (Employee id)
+    private String internetCorpUserId;
+    //鎵�灞炴姢澹�
+    private String nurseCorpUserId;
+    //绗竴娆″埌搴楁椂闂�
+    private Date firstArriveTime;
+    //绗竴娆′笅鍗曟椂闂�(缁撹处鎴愬姛鐨勬椂闂�)
+    private Date firstPayOrderTime;
+    //鏈�鍚庝竴娆℃墽琛屾椂闂�
+    private Date lastDeductionTime;
+    //openId
+    private String openId;
+    //鍏紬鍙穙penId
+    private String gzhOpenId;
+    //鏄惁鍚湁鐑帥鍚夐」鐩�
+    private Boolean isHaveRmj = false;
+
 }

--
Gitblit v1.8.0