From 5506edbe54883b31db3cc8e4a1d9d0795a18a3c9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 27 十二月 2024 14:37:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/service/src/main/java/com/doumee/dao/system/model/SystemUser.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/system/model/SystemUser.java b/server/service/src/main/java/com/doumee/dao/system/model/SystemUser.java
index 198aad2..8d0394c 100644
--- a/server/service/src/main/java/com/doumee/dao/system/model/SystemUser.java
+++ b/server/service/src/main/java/com/doumee/dao/system/model/SystemUser.java
@@ -5,6 +5,7 @@
import com.doumee.core.constants.OperaType;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.CompanyDepartment;
+import com.doumee.dao.business.model.CompanyPermission;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -114,16 +115,32 @@
@TableField(exist = false)
private Integer authNum;
- @ApiModelProperty(value = "鎵�灞炰紒涓氫俊鎭")
+ @ApiModelProperty(value = "鏄惁涓荤 0鍚� 1鏄�", example = "1")
+ @TableField(exist = false)
+ private Integer headStatus;
+
+ @ApiModelProperty(value = "鎵�灞炰紒涓氫俊鎭�")
@TableField(exist = false)
private Company company;
+
+
+ @ApiModelProperty(value = "灞曠ず鐨勪紒涓氫俊鎭�")
+ @TableField(exist = false)
+ private Company showCompany;
+
+
@ApiModelProperty(value = "鎵�灞炵粍缁囧璞�")
@TableField(exist = false)
- private CompanyDepartment department;
+ private CompanyDepartment companyDepartment;
@ApiModelProperty(value = "骞冲彴绠＄悊鍛樻潈闄愬唴浼佷笟缂栫爜闆嗗悎")
@TableField(exist = false)
private List<Integer> companyIdList;
+
+ @ApiModelProperty(value = "浼佷笟鐢ㄦ埛 - 鍙煡鐪嬬粍缁囨暟鎹�")
+ @TableField(exist = false)
+ private List<CompanyPermission> companyPermissionList;
+
@ApiModelProperty(value = "鏁版嵁鏉冮檺鍐呯粍缁囩紪鐮侀泦鍚�")
@TableField(exist = false)
private List<Integer> departIdList;
--
Gitblit v1.9.3