From 0a206f3acb9af0ec9db650861d34a256cda1c960 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 26 二月 2026 17:48:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Collect.java | 8 ++++++--
1 files changed, 6 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..1901852 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 = "鍒楄〃鍥�")
@@ -111,6 +111,10 @@
private String content;
+ @ApiModelProperty(value = "绀惧尯灏侀潰鍥�")
+ @TableField(exist = false)
+ private String activityImgurl;
+
}
--
Gitblit v1.9.3