From 80fd41ea0dc602ac3ca33778f17fce5bc2e817b1 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 16 一月 2026 18:58:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Shop.java | 67 +++++++++++++++++++++++++++++++--
1 files changed, 63 insertions(+), 4 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 2f702c6..91eaecf 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
@@ -81,6 +81,15 @@
@ApiModelProperty(value = "韬唤璇佹闈㈢収")
@ExcelColumn(name="韬唤璇佹闈㈢収")
private String idcardImg;
+ @ApiModelProperty(value = "娉曚汉濮撳悕")
+ @ExcelColumn(name="娉曚汉濮撳悕")
+ private String legalPersonName;
+ @ApiModelProperty(value = "娉曚汉鐢佃瘽")
+ @ExcelColumn(name="娉曚汉鐢佃瘽")
+ private String legalPersonPhone;
+ @ApiModelProperty(value = "寰俊openId")
+ @ExcelColumn(name="寰俊openId")
+ private String openId;
@ApiModelProperty(value = "韬唤璇佸弽闈㈢収")
@ExcelColumn(name="韬唤璇佸弽闈㈢収")
@@ -89,23 +98,54 @@
@ApiModelProperty(value = "钀ヤ笟鎵х収")
@ExcelColumn(name="钀ヤ笟鎵х収")
private String businessImg;
+ @ApiModelProperty(value = "鍟嗗缂栧彿")
+ @ExcelColumn(name="鍟嗗缂栧彿")
+ private String code;
+ @ApiModelProperty(value = "鐧诲綍鍚�")
+ @ExcelColumn(name="鐧诲綍鍚�")
+ private String username;
+ @ApiModelProperty(value = "瀵嗙爜鐩�")
+ @ExcelColumn(name="瀵嗙爜鐩�")
+ private String salt;
+ @ApiModelProperty(value = "鐧诲綍瀵嗙爜")
+ @ExcelColumn(name="鐧诲綍瀵嗙爜")
+ private String password;
+ @ApiModelProperty(value = "瀹ｄ紶娴锋姤")
+ @ExcelColumn(name="瀹ｄ紶娴锋姤")
+ private String posterImg;
+ @ApiModelProperty(value = "閿�鍞ā寮� 0骞冲彴搴楅摵 1鑷富閲囪喘")
+ @ExcelColumn(name="閿�鍞ā寮� 0骞冲彴搴楅摵 1鑷富閲囪喘")
+ private Integer saleType;
+ @ApiModelProperty(value = "閿�鍞ā寮� 0骞冲彴搴楅摵 1鑷富閲囪喘")
+ @ExcelColumn(name="閿�鍞ā寮� 0骞冲彴搴楅摵 1鑷富閲囪喘")
+ private Integer bigAreaId;
+ @ApiModelProperty(value = "绉垎浣欓")
+ @ExcelColumn(name="绉垎浣欓")
+ private BigDecimal integral;
+ @ApiModelProperty(value = "绉垎绱")
+ @ExcelColumn(name="绉垎绱")
+ private BigDecimal totalIntegral;
+
+ @ApiModelProperty(value = "鍙彁鐜伴噾棰�")
+ @ExcelColumn(name="鍙彁鎴愰噾棰�")
+ private BigDecimal amount;
+
+ @ApiModelProperty(value = "绱鍙彁鎴愰噾棰�")
+ @ExcelColumn(name="绱鍙彁鎴愰噾棰�")
+ private BigDecimal totalAmount;
@ApiModelProperty(value = "鐘舵��0姝ｅ父 1绂佺敤", example = "1")
@ExcelColumn(name="鐘舵��0姝ｅ父 1绂佺敤")
private Integer status;
-
@ApiModelProperty(value = "瀹氫綅缁忓害", example = "1")
@ExcelColumn(name="瀹氫綅缁忓害")
private BigDecimal longitude;
-
@ApiModelProperty(value = "瀹氫綅缁村害", example = "1")
@ExcelColumn(name="瀹氫綅缁村害")
private BigDecimal latitude;
-
@ApiModelProperty(value = "鎵�灞炲幙鍖虹紪鐮侊紙鍏宠仈areas)", example = "1")
@ExcelColumn(name="鎵�灞炲幙鍖虹紪鐮侊紙鍏宠仈areas)")
private Integer areaId;
-
@ApiModelProperty(value = "鍦板潃")
@ExcelColumn(name="鍦板潃")
private String addr;
@@ -160,14 +200,27 @@
@ApiModelProperty(value = "鐢ㄦ埛鐢佃瘽")
@TableField(exist = false)
private String memberPhone;
+ @ApiModelProperty(value = "鐪佸競鍖�")
+ @TableField(exist = false)
+ private Areas areas;
+ @ApiModelProperty(value = "鎵�灞炲ぇ鍖哄悕绉�")
+ @TableField(exist = false)
+ private String bigAreaName;
@ApiModelProperty(value = "鏂囦欢鍦板潃")
@TableField(exist = false)
private String imgFullUrl;
+ @ApiModelProperty(value = "瀹氫綅淇℃伅")
+ @TableField(exist = false)
+ private String locationInfo;
@ApiModelProperty(value = "闂ㄥ簵鎵撳垎")
@TableField(exist = false)
private BigDecimal score;
+
+ @ApiModelProperty(value = "璺濈")
+ @TableField(exist = false)
+ private BigDecimal distance;
@ApiModelProperty(value = "搴楅摵璁块棶鏁版嵁锛氫富椤垫�昏闂噺")
@@ -215,6 +268,9 @@
@ApiModelProperty(value = "浼樻儬鍒革細浼樻儬鍒搁鍙栨�绘暟")
@TableField(exist = false)
private BigDecimal couponDrawCount;
+ @ApiModelProperty(value = "鍟嗗搧缂栫爜")
+ @TableField(exist = false)
+ private Integer goodsId;
@ApiModelProperty(value = "浼樻儬鍒革細浼樻儬鍒镐娇鐢ㄦ�绘暟(寮�)")
@TableField(exist = false)
@@ -223,6 +279,9 @@
@ApiModelProperty(value = "浼樻儬鍒革細浼樻儬鍒镐娇鐢ㄩ噾棰�(鍏�)")
@TableField(exist = false)
private BigDecimal couponUserMoney;
+ @ApiModelProperty(value = "鏌愬晢鍝佷緵璐т环(鍏�)")
+ @TableField(exist = false)
+ private BigDecimal goodsPrice;
@ApiModelProperty(value = "搴楅摵鏍囩")
--
Gitblit v1.9.3