From 1cc890a6f7432147c633e2cf7c3d4043460e85e9 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期五, 20 十月 2023 18:42:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/phis/dt/employee/EmployeeDt.java |  264 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 255 insertions(+), 9 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/phis/dt/employee/EmployeeDt.java b/phis-feign/src/main/java/com/hz/phis/dt/employee/EmployeeDt.java
index f05936e..d495388 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/employee/EmployeeDt.java
+++ b/phis-feign/src/main/java/com/hz/phis/dt/employee/EmployeeDt.java
@@ -1,14 +1,260 @@
 package com.hz.phis.dt.employee;
 
-import com.hz.his.dto.PageDto;
-import lombok.Data;
+import com.hz.phis.dt.BaseDt;
 
 /**
- * @author fwq
- * 鍛樺伐鎵╁睍
- * */
-@Data
-public class EmployeeDt extends PageDto {
-    /**淇敼鏃堕棿*/
-    private String updateTime;
+ *
+ * 鍛樺伐
+ * Date:2021/8/4 17:35
+ */
+public class EmployeeDt extends BaseDt {
+
+    /**閿欒鐮�*/
+    private String code;
+    /**閿欒淇℃伅*/
+    private String msg;
+
+    /**寰俊unionId*/
+    private String unionId;
+    /**浼佷笟寰俊鍐呯敤鎴穒d*/
+    private String userId;
+    /**涓枃鍚嶇О*/
+    private String cnName;
+    /**鑻辨枃鍚嶇О*/
+    private String enName;
+    /**鑱旂郴鐢佃瘽*/
+    private String tel;
+    /**閭*/
+    private String email;
+    /**澶村儚*/
+    private String imgUrl;
+    /**his鎺ュ彛id*/
+    private String apiId;
+    /**鏄惁鍦ㄨ亴*/
+    private Integer isJob = NO;
+    /**鎬у埆0鐢�1濂�*/
+    private Integer gender = NO;
+    /**鍛樺伐缂栧彿*/
+    private String employeeNo;
+    /**鏈�鍚庝竴娆￠�夋嫨瑙掕壊id*/
+    private String roleId;
+    /**鏄惁鍚屾瑙掕壊*/
+    private Integer isSyncRole = YES;
+
+    /**sql璇彞杩斿洖浣跨敤瀛楁*/
+    private String shopId;
+    private String shopName;
+    private String shopHisId;
+    private String roleName;
+    private String roleStr;
+    private String roleTypeId;
+    private String adminRoleId;
+
+    public EmployeeDt() {
+    }
+
+
+    public String getUnionId() {
+        return unionId;
+    }
+
+    public void setUnionId(String unionId) {
+        this.unionId = unionId;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getCnName() {
+        return cnName;
+    }
+
+    public void setCnName(String cnName) {
+        this.cnName = cnName;
+    }
+
+    public String getEnName() {
+        return enName;
+    }
+
+    public void setEnName(String enName) {
+        this.enName = enName;
+    }
+
+    public String getTel() {
+        return tel;
+    }
+
+    public void setTel(String tel) {
+        this.tel = tel;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getImgUrl() {
+        return imgUrl;
+    }
+
+    public void setImgUrl(String imgUrl) {
+        this.imgUrl = imgUrl;
+    }
+
+    public String getApiId() {
+        return apiId;
+    }
+
+    public void setApiId(String apiId) {
+        this.apiId = apiId;
+    }
+
+    public Integer getIsJob() {
+        return isJob;
+    }
+
+    public void setIsJob(Integer isJob) {
+        this.isJob = isJob;
+    }
+
+    public Integer getGender() {
+        return gender;
+    }
+
+    public void setGender(Integer gender) {
+        this.gender = gender;
+    }
+
+    public String getShopId() {
+        return shopId;
+    }
+
+    public void setShopId(String shopId) {
+        this.shopId = shopId;
+    }
+
+    public String getRoleStr() {
+        return roleStr;
+    }
+
+    public void setRoleStr(String roleStr) {
+        this.roleStr = roleStr;
+    }
+
+    public String getEmployeeNo() {
+        return employeeNo;
+    }
+
+    public void setEmployeeNo(String employeeNo) {
+        this.employeeNo = employeeNo;
+    }
+
+    public String getShopName() {
+        return shopName;
+    }
+
+    public void setShopName(String shopName) {
+        this.shopName = shopName;
+    }
+
+    public String getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(String roleId) {
+        this.roleId = roleId;
+    }
+
+    public String getRoleName() {
+        return roleName;
+    }
+
+    public void setRoleName(String roleName) {
+        this.roleName = roleName;
+    }
+
+    public Integer getIsSyncRole() {
+        return isSyncRole;
+    }
+
+    public void setIsSyncRole(Integer isSyncRole) {
+        this.isSyncRole = isSyncRole;
+    }
+
+    public String getShopHisId() {
+        return shopHisId;
+    }
+
+    public void setShopHisId(String shopHisId) {
+        this.shopHisId = shopHisId;
+    }
+
+    public String getRoleTypeId() {
+        return roleTypeId;
+    }
+
+    public void setRoleTypeId(String roleTypeId) {
+        this.roleTypeId = roleTypeId;
+    }
+
+    public String getAdminRoleId() {
+        return adminRoleId;
+    }
+
+    public void setAdminRoleId(String adminRoleId) {
+        this.adminRoleId = adminRoleId;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    @Override
+    public String toString() {
+        return "Employee{" +
+                "code='" + code + '\'' +
+                ", msg='" + msg + '\'' +
+                ", unionId='" + unionId + '\'' +
+                ", userId='" + userId + '\'' +
+                ", cnName='" + cnName + '\'' +
+                ", enName='" + enName + '\'' +
+                ", tel='" + tel + '\'' +
+                ", email='" + email + '\'' +
+                ", imgUrl='" + imgUrl + '\'' +
+                ", apiId='" + apiId + '\'' +
+                ", isJob=" + isJob +
+                ", gender=" + gender +
+                ", employeeNo='" + employeeNo + '\'' +
+                ", roleId='" + roleId + '\'' +
+                ", isSyncRole=" + isSyncRole +
+                ", shopId='" + shopId + '\'' +
+                ", shopName='" + shopName + '\'' +
+                ", shopHisId='" + shopHisId + '\'' +
+                ", roleName='" + roleName + '\'' +
+                ", roleStr='" + roleStr + '\'' +
+                ", roleTypeId='" + roleTypeId + '\'' +
+                ", adminRoleId='" + adminRoleId + '\'' +
+                '}';
+    }
 }

--
Gitblit v1.8.0