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/business/model/CompanyPermission.java | 45 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 41 insertions(+), 4 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 e293f39..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
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -8,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;
@@ -19,7 +22,7 @@
@Data
@ApiModel("绠＄悊鍛樼鐞嗕紒涓氭潈闄�")
@TableName("`company_permission`")
-public class CompanyPermission {
+public class CompanyPermission implements Serializable {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@@ -32,7 +35,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,12 +44,15 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
+ @ApiModelProperty(value = "绫诲瀷 0骞冲彴绔紒涓氱鐞嗘潈闄� 1浼佷笟闆嗗洟璐﹀彿", example = "1")
+ @ExcelColumn(name="绫诲瀷 0骞冲彴绔紒涓氱鐞嗘潈闄� 1浼佷笟闆嗗洟璐﹀彿")
+ private Integer type;
@ApiModelProperty(value = "澶囨敞")
@ExcelColumn(name="澶囨敞")
@@ -59,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")
- @ExcelColumn(name="浼佷笟缂栫爜闆嗗悎")
+ @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