From deb4575b72443cf906946a9fb28a557c16556fb9 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 01 十一月 2024 09:30:50 +0800
Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/yunyibao into 2.0.1
---
server/service/src/main/java/com/doumee/dao/system/model/SystemUser.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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 74ae18e..c1528c6 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
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.doumee.core.constants.OperaType;
import com.doumee.dao.business.model.Company;
+import com.doumee.dao.business.model.CompanyDepartment;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -67,6 +68,8 @@
@ApiModelProperty(value = "浼佷笟缂栫爜")
private Integer companyId;
+ @ApiModelProperty(value = "缁勭粐缂栫爜")
+ private Integer departmentId;
@ApiModelProperty(value = "绫诲瀷 0骞冲彴鐢ㄦ埛 1浼佷笟鐢ㄦ埛 2鍟嗘埛鐢ㄦ埛")
private Integer type;
@@ -105,9 +108,15 @@
@ApiModelProperty(value = "鎵�灞炰紒涓氫俊鎭")
@TableField(exist = false)
private Company company;
+ @ApiModelProperty(value = "鎵�灞炵粍缁囧璞�")
+ @TableField(exist = false)
+ private CompanyDepartment department;
- @ApiModelProperty(value = "鏉冮檺鍐呬紒涓氱紪鐮侀泦鍚�")
+ @ApiModelProperty(value = "骞冲彴绠＄悊鍛樻潈闄愬唴浼佷笟缂栫爜闆嗗悎")
@TableField(exist = false)
private List<Integer> companyIdList;
+ @ApiModelProperty(value = "鏁版嵁鏉冮檺鍐呯粍缁囩紪鐮侀泦鍚�")
+ @TableField(exist = false)
+ private List<Integer> departIdList;
}
--
Gitblit v1.9.3