From fc9240bd6b246ad71c4050510880a49ce07138a3 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 13 二月 2026 09:51:13 +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/Activity.java | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 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 56f2cc4..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涓烘椿鍔級")
@@ -130,17 +126,25 @@
@ExcelColumn(name="鎵�灞炲垎绫荤紪鐮侊紙鍏宠仈labels)")
private Integer labelId;
+ @ApiModelProperty(value = "鎵�灞炲搧鐗岀紪鐮侊紙鍏宠仈labels)", example = "1")
+ @ExcelColumn(name="鎵�灞炲搧鐗岀紪鐮侊紙鍏宠仈labels)")
+ private Integer brandId;
+
@ApiModelProperty(value = "鐢ㄦ埛缂栫爜锛堝叧鑱攎ember琛級", example = "1")
@ExcelColumn(name="鐢ㄦ埛缂栫爜锛堝叧鑱攎ember琛級")
private Integer memberId;
- @ApiModelProperty(value = "鍐呭绫诲瀷 0鍥剧墖 1瑙嗛", example = "1")
- @ExcelColumn(name="鍐呭绫诲瀷 0鍥剧墖 1瑙嗛")
+ @ApiModelProperty(value = "鍐呭绫诲瀷 0瀵屾枃鏈� 1澶栭摼", example = "1")
+ @ExcelColumn(name="鍐呭绫诲瀷 0瀵屾枃鏈� 1澶栭摼")
private Integer contentType;
@ApiModelProperty(value = "鍐呭瀵屾枃鏈�")
private String content;
+
+ @ApiModelProperty(value = "棰滆壊鑹插��")
+ @TableField(exist = false)
+ private String param;
@ApiModelProperty(value = "鍙戝竷鐢ㄦ埛濮撳悕")
@TableField(exist = false)
@@ -154,9 +158,23 @@
@TableField(exist = false)
private String lablesName;
+ @ApiModelProperty(value = "鎵�灞炲搧鐗屽悕绉�")
+ @TableField(exist = false)
+ private String brandName;
+
@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)
@@ -216,5 +234,8 @@
@TableField(exist = false)
private String shopAddr;
+ @ApiModelProperty(value = "绠�瑕佽鏄�")
+ @TableField(exist = false)
+ private String contentInfo;
}
--
Gitblit v1.9.3