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/Activity.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Activity.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Activity.java
index b4ff095..a33d203 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Activity.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Activity.java
@@ -68,22 +68,18 @@
@ApiModelProperty(value = "寮�濮嬫椂闂达紙type涓烘椿鍔級")
@ExcelColumn(name="寮�濮嬫椂闂达紙type涓烘椿鍔級")
-
private Date starttime;
@ApiModelProperty(value = "缁撴潫鏃堕棿锛坱ype涓烘椿鍔級")
@ExcelColumn(name="缁撴潫鏃堕棿锛坱ype涓烘椿鍔級")
-
private Date endtime;
@ApiModelProperty(value = "鎶ュ悕寮�濮嬫椂闂达紙type涓烘椿鍔級")
@ExcelColumn(name="鎶ュ悕寮�濮嬫椂闂达紙type涓烘椿鍔級")
-
private Date signStarttime;
@ApiModelProperty(value = "鎶ュ悕缁撴潫鏃堕棿锛坱ype涓烘椿鍔級")
@ExcelColumn(name="鎶ュ悕缁撴潫鏃堕棿锛坱ype涓烘椿鍔級")
-
private Date signEndtime;
@ApiModelProperty(value = "娲诲姩鍦板潃锛坱ype涓烘椿鍔級")
@@ -129,6 +125,7 @@
@ApiModelProperty(value = "鎵�灞炲垎绫荤紪鐮侊紙鍏宠仈labels)", example = "1")
@ExcelColumn(name="鎵�灞炲垎绫荤紪鐮侊紙鍏宠仈labels)")
private Integer labelId;
+
@ApiModelProperty(value = "鎵�灞炲搧鐗岀紪鐮侊紙鍏宠仈labels)", example = "1")
@ExcelColumn(name="鎵�灞炲搧鐗岀紪鐮侊紙鍏宠仈labels)")
private Integer brandId;
@@ -145,6 +142,10 @@
private String content;
+ @ApiModelProperty(value = "棰滆壊鑹插��")
+ @TableField(exist = false)
+ private String param;
+
@ApiModelProperty(value = "鍙戝竷鐢ㄦ埛濮撳悕")
@TableField(exist = false)
private String realName;
@@ -156,6 +157,7 @@
@ApiModelProperty(value = "璧勮鍒嗙被鍚嶇О")
@TableField(exist = false)
private String lablesName;
+
@ApiModelProperty(value = "鎵�灞炲搧鐗屽悕绉�")
@TableField(exist = false)
private String brandName;
@@ -163,6 +165,16 @@
@ApiModelProperty(value = "鐐硅禐鏁伴噺")
@TableField(exist = false)
private Integer zanCount;
+
+
+ @ApiModelProperty(value = "鏄惁鐐硅禐锛�0=鍚︼紱1=鏄�")
+ @TableField(exist = false)
+ private Integer zanStatus;
+
+ @ApiModelProperty(value = "鏄惁鏀惰棌锛�0=鍚︼紱1=鏄�")
+ @TableField(exist = false)
+ private Integer collectStatus;
+
@ApiModelProperty(value = "鏀惰棌鏁伴噺")
@TableField(exist = false)
@@ -222,5 +234,8 @@
@TableField(exist = false)
private String shopAddr;
+ @ApiModelProperty(value = "绠�瑕佽鏄�")
+ @TableField(exist = false)
+ private String contentInfo;
}
--
Gitblit v1.9.3