From 277f2d65a70bddbf9c571e2023315faad26e12d0 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期一, 18 三月 2024 14:11:44 +0800 Subject: [PATCH] Merge branch 'master' into 1.0.1 --- server/service/src/main/java/com/doumee/dao/business/model/Company.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Company.java b/server/service/src/main/java/com/doumee/dao/business/model/Company.java index c39b7f9..691b1b8 100644 --- a/server/service/src/main/java/com/doumee/dao/business/model/Company.java +++ b/server/service/src/main/java/com/doumee/dao/business/model/Company.java @@ -70,8 +70,8 @@ @ExcelColumn(name="鎺掑簭鐮�") private Integer sortnum; - @ApiModelProperty(value = "绫诲瀷 ", example = "1") - @ExcelColumn(name="绫诲瀷 ") + @ApiModelProperty(value = "绫诲瀷 0浼佷笟 1鍟嗘埛 ", example = "1") + @ExcelColumn(name="绫诲瀷 0浼佷笟 1鍟嗘埛 ") private Integer type; @ApiModelProperty(value = "缁熶竴淇$敤浠g爜") -- Gitblit v1.9.3