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 | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 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 ee9dd3f..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
@@ -87,6 +87,9 @@
@ApiModelProperty(value = "娉曚汉鐢佃瘽")
@ExcelColumn(name="娉曚汉鐢佃瘽")
private String legalPersonPhone;
+ @ApiModelProperty(value = "寰俊openId")
+ @ExcelColumn(name="寰俊openId")
+ private String openId;
@ApiModelProperty(value = "韬唤璇佸弽闈㈢収")
@ExcelColumn(name="韬唤璇佸弽闈㈢収")
@@ -123,7 +126,7 @@
@ExcelColumn(name="绉垎绱")
private BigDecimal totalIntegral;
- @ApiModelProperty(value = "鍙彁鎴愰噾棰�")
+ @ApiModelProperty(value = "鍙彁鐜伴噾棰�")
@ExcelColumn(name="鍙彁鎴愰噾棰�")
private BigDecimal amount;
@@ -185,6 +188,14 @@
@ApiModelProperty(value = "钀ヤ笟缁撴潫鏃堕棿")
private String brandStory;
+
+ @ApiModelProperty(value = "灏忕▼搴忕爜鍦板潃")
+ private String programCode;
+
+
+ @ApiModelProperty(value = "涓撳睘娴锋姤鐮�")
+ private String posterImgCode;
+
@ApiModelProperty(value = "澶村儚")
@TableField(exist = false)
@@ -268,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)
--
Gitblit v1.9.3