From 50fb58286ed3b718c39a97e0987ee7561a295651 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期五, 04 七月 2025 17:56:41 +0800 Subject: [PATCH] git ch --- server/service/src/main/java/com/doumee/dao/system/model/SystemUser.java | 46 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 43 insertions(+), 3 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 d66ac4d..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 @@ -4,6 +4,8 @@ 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 com.doumee.dao.business.model.CompanyPermission; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import com.baomidou.mybatisplus.annotation.IdType; @@ -67,7 +69,9 @@ @ApiModelProperty(value = "浼佷笟缂栫爜") private Integer companyId; - @ApiModelProperty(value = "绫诲瀷 0骞冲彴鐢ㄦ埛 1浼佷笟鐢ㄦ埛") + @ApiModelProperty(value = "缁勭粐缂栫爜") + private Integer departmentId; + @ApiModelProperty(value = "绫诲瀷 0骞冲彴鐢ㄦ埛 1浼佷笟鐢ㄦ埛 2鍟嗘埛鐢ㄦ埛") private Integer type; @ApiModelProperty(value = "瀵嗙爜") @@ -98,11 +102,47 @@ @ApiModelProperty(value = "0 鍚敤 1 绂佺敤") private Integer status; - @ApiModelProperty(value = "鎵�灞炰紒涓氫俊鎭") + + @ApiModelProperty(value = "寰俊灏忕▼搴廜PENID") + private String openid; + @ApiModelProperty(value = "浼佷笟鍚嶇О") + @TableField(exist = false) + private String companyName; + @ApiModelProperty(value = "閮ㄩ棬鍚嶇О") + @TableField(exist = false) + private String departmentName; + @ApiModelProperty(value = "鎺堟潈浼佷笟鏁�") + @TableField(exist = false) + private Integer authNum; + + @ApiModelProperty(value = "鏄惁涓荤 0鍚� 1鏄�", example = "1") + @TableField(exist = false) + private Integer headStatus; + + @ApiModelProperty(value = "鎵�灞炰紒涓氫俊鎭�") @TableField(exist = false) private Company company; - @ApiModelProperty(value = "鏉冮檺鍐呬紒涓氱紪鐮侀泦鍚�") + + + @ApiModelProperty(value = "灞曠ず鐨勪紒涓氫俊鎭�") + @TableField(exist = false) + private Company showCompany; + + + @ApiModelProperty(value = "鎵�灞炵粍缁囧璞�") + @TableField(exist = false) + 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