From bc22a1fce8b936f61e1f799689ee5795fc2508b0 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期三, 17 一月 2024 15:22:06 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/service/src/main/java/com/doumee/dao/business/model/CompanyPermission.java | 4 ++++ 1 files changed, 4 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 70c7441..e293f39 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,7 @@ import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import java.util.Date; +import java.util.List; /** * 绠$悊鍛樼鐞嗕紒涓氭潈闄� @@ -58,5 +59,8 @@ @ApiModelProperty(value = "鐢ㄦ埛缂栫爜", example = "1") @ExcelColumn(name="鐢ㄦ埛缂栫爜") private Integer userId; + @ApiModelProperty(value = "浼佷笟缂栫爜闆嗗悎", example = "1") + @ExcelColumn(name="浼佷笟缂栫爜闆嗗悎") + private List<Integer> companyIdList; } -- Gitblit v1.9.3