From c6b57d91ab6d54f6f46ace728baf80a4ac49fad3 Mon Sep 17 00:00:00 2001 From: ANDRU-PC\Andru <769883346@qq.com> Date: 星期二, 04 七月 2023 15:54:45 +0800 Subject: [PATCH] Merge branch 'master' into master-test --- phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 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 ce36a28..091e66d 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,8 +1,11 @@ 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 @@ -69,6 +72,18 @@ 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; + + } -- Gitblit v1.8.0