From d295f1f7706e51b158cb7252b6ac633b1f9a1982 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 12 五月 2026 09:07:56 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dingyuannongji
---
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Collect.java | 16 ++++++++++++++--
1 files changed, 14 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..c0b42cd 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 = "鍒楄〃鍥�")
@@ -110,6 +110,18 @@
@TableField(exist = false)
private String content;
+ @ApiModelProperty(value = "鏈�浣庝环" )
+ @TableField(exist = false)
+ private BigDecimal minPrice;
+
+
+ @ApiModelProperty(value = "绀惧尯灏侀潰鍥�")
+ @TableField(exist = false)
+ private String activityImgurl;
+
+ @ApiModelProperty(value = "鍒嗙被棰滆壊")
+ @TableField(exist = false)
+ private String param;
--
Gitblit v1.9.3