From a76e2318dd2731ff713df6e262396a9175d029f7 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 13 二月 2026 09:18:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/dmmall_service/src/main/java/com/doumee/dao/business/model/Collect.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Collect.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Collect.java
index 94b14dd..655c222 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Collect.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Collect.java
@@ -62,8 +62,8 @@
     @ExcelColumn(name="瀵硅薄缂栫爜")
     private Integer objId;
 
-    @ApiModelProperty(value = "瀵硅薄绫诲瀷 0娲诲姩鎺㈠簵鍜ㄨ 1鍟嗗搧", example = "1")
-    @ExcelColumn(name="瀵硅薄绫诲瀷 0娲诲姩鎺㈠簵鍜ㄨ")
+    @ApiModelProperty(value = "瀵硅薄绫诲瀷 0绀惧尯 1鍟嗗搧", example = "1")
+    @ExcelColumn(name="瀵硅薄绫诲瀷 0绀惧尯 1鍟嗗搧")
     private Integer objType;
 
     @ApiModelProperty(value = "鍒楄〃鍥�")

--
Gitblit v1.9.3