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/business/model/CompanyPermission.java | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/CompanyPermission.java b/server/service/src/main/java/com/doumee/dao/business/model/CompanyPermission.java
index 6ebf465..956c7c0 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/CompanyPermission.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/CompanyPermission.java
@@ -9,6 +9,8 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serializable;
import java.util.Date;
import java.util.List;
@@ -20,7 +22,7 @@
@Data
@ApiModel("绠＄悊鍛樼鐞嗕紒涓氭潈闄�")
@TableName("`company_permission`")
-public class CompanyPermission {
+public class CompanyPermission implements Serializable {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@@ -63,8 +65,39 @@
@ApiModelProperty(value = "鐢ㄦ埛缂栫爜", example = "1")
@ExcelColumn(name="鐢ㄦ埛缂栫爜")
private Integer userId;
+
+ @ApiModelProperty(value = "浼佷笟鍚嶇О", example = "1")
+ @TableField(exist = false)
+ private String companyName;
+
+ @ApiModelProperty(value = "璐﹀彿", example = "1")
+ @TableField(exist = false)
+ private String username;
+
+ @ApiModelProperty(value = "濮撳悕", example = "1")
+ @TableField(exist = false)
+ private String realname;
+
+ @ApiModelProperty(value = "鑱旂郴鏂瑰紡", example = "1")
+ @TableField(exist = false)
+ private String mobile;
+
+ @ApiModelProperty(value = "鎺堟潈浜�", example = "1")
+ @TableField(exist = false)
+ private String auditName;
+
@ApiModelProperty(value = "浼佷笟缂栫爜闆嗗悎", example = "1")
@TableField(exist = false)
private List<Integer> companyIdList;
+
+ @ApiModelProperty(value = "鏄惁褰撳墠灞曠ず浼佷笟 0 = 鍚� 锛� 1 = 鏄�", example = "1")
+ @TableField(exist = false)
+ private Integer isShow = 0;
+
+ @ApiModelProperty(value = "鏄惁鑷韩浼佷笟 0 = 鍚� 锛� 1 = 鏄�", example = "1")
+ @TableField(exist = false)
+ private Integer isSelfCompany = 0;
+
+
}
--
Gitblit v1.9.3