From c261cb7ff2e4cfce233d02c6aca9e8f85e8ba1ba Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 20 一月 2026 18:05:08 +0800
Subject: [PATCH] 经销商管理
---
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Activity.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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..b4ff095 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
@@ -129,13 +129,16 @@
@ApiModelProperty(value = "鎵�灞炲垎绫荤紪鐮侊紙鍏宠仈labels)", example = "1")
@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 = "鍐呭瀵屾枃鏈�")
@@ -153,6 +156,9 @@
@ApiModelProperty(value = "璧勮鍒嗙被鍚嶇О")
@TableField(exist = false)
private String lablesName;
+ @ApiModelProperty(value = "鎵�灞炲搧鐗屽悕绉�")
+ @TableField(exist = false)
+ private String brandName;
@ApiModelProperty(value = "鐐硅禐鏁伴噺")
@TableField(exist = false)
--
Gitblit v1.9.3