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/business/model/CompanyPermission.java |    3 +++
 1 files changed, 3 insertions(+), 0 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 0a25a2b..6ebf465 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
@@ -48,6 +48,9 @@
     @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="澶囨敞")

--
Gitblit v1.9.3