From 8fd09daba5c89106b4a9aacd8d5ef9354afc93be Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期六, 28 二月 2026 14:22:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Shop.java | 22 ++++++++++++++++++++++
1 files changed, 22 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 91eaecf..3319b14 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;
@@ -271,6 +279,12 @@
@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)
@@ -288,4 +302,12 @@
@TableField(exist = false)
private List<ProductLabel> productList;
+
+ @ApiModelProperty(value = "鎵�灞炲煄甯傜紪鐮侊紙鍏宠仈areas)", example = "1")
+ @TableField(exist = false)
+ private Integer cityId;
+
+ @ApiModelProperty(value = "鎵�灞炵渷浠界紪鐮侊紙鍏宠仈areas)", example = "1")
+ @TableField(exist = false)
+ private Integer provinceId;
}
--
Gitblit v1.9.3