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/Shop.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Shop.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Shop.java
index 73ca9fd..d816a71 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Shop.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Shop.java
@@ -189,6 +189,14 @@
@ApiModelProperty(value = "钀ヤ笟缁撴潫鏃堕棿")
private String brandStory;
+ @ApiModelProperty(value = "灏忕▼搴忕爜鍦板潃")
+ private String programCode;
+
+
+ @ApiModelProperty(value = "涓撳睘娴锋姤鐮�")
+ private String posterImgCode;
+
+
@ApiModelProperty(value = "澶村儚")
@TableField(exist = false)
private String memberImgurl;
@@ -268,6 +276,15 @@
@ApiModelProperty(value = "浼樻儬鍒革細浼樻儬鍒搁鍙栨�绘暟")
@TableField(exist = false)
private BigDecimal couponDrawCount;
+ @ApiModelProperty(value = "鍟嗗搧缂栫爜")
+ @TableField(exist = false)
+ private Integer goodsId;
+ @ApiModelProperty(value = "宸茶缃环鏍间骇鍝佹暟閲�")
+ @TableField(exist = false)
+ private Long pricedGoodsNum;
+ @ApiModelProperty(value = "鍟嗗搧鎬婚噺")
+ @TableField(exist = false)
+ private Long goodsNum;
@ApiModelProperty(value = "浼樻儬鍒革細浼樻儬鍒镐娇鐢ㄦ�绘暟(寮�)")
@TableField(exist = false)
@@ -276,6 +293,9 @@
@ApiModelProperty(value = "浼樻儬鍒革細浼樻儬鍒镐娇鐢ㄩ噾棰�(鍏�)")
@TableField(exist = false)
private BigDecimal couponUserMoney;
+ @ApiModelProperty(value = "鏌愬晢鍝佷緵璐т环(鍏�)")
+ @TableField(exist = false)
+ private BigDecimal goodsPrice;
@ApiModelProperty(value = "搴楅摵鏍囩")
--
Gitblit v1.9.3