From b96cc19f216ccd7451a5d2758055a4f174587ba9 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 07 五月 2025 16:12:19 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java index 96dc344..2bbc57c 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java @@ -160,8 +160,9 @@ private Integer categoryId; @ApiModelProperty(value = "鍏宠仈鍒嗙被鍚嶇О") - @ExcelColumn(name="鍏宠仈鍒嗙被鍚嶇О") + @ExcelColumn(name="杞﹁締鍒嗙被" ,index = 8,width = 16) private String categoryName; + @ApiModelProperty(value = "鍏宠仈鐖剁骇鍒嗙被缂栫爜锛堝叧鑱攃ategory)", example = "1") @ExcelColumn(name="鍏宠仈鐖剁骇鍒嗙被缂栫爜锛堝叧鑱攃ategory)") private Integer categoryParentId; -- Gitblit v1.9.3