From 55642c818f14bf8cf52c98e6858014bd8dc3d3a7 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 16 四月 2026 20:10:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/dao/business/model/ShopInfo.java | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/ShopInfo.java b/server/services/src/main/java/com/doumee/dao/business/model/ShopInfo.java
index 9e9ff65..7b14ba3 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/ShopInfo.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/ShopInfo.java
@@ -125,7 +125,7 @@
@ApiModelProperty(value = "瀹℃壒澶囨敞")
private String auditRemark;
- @ApiModelProperty(value = "OPENID")
+ @ApiModelProperty(value = "褰撳墠鐧诲綍鐢ㄦ埛openid")
private String openid;
@ApiModelProperty(value = "鏀粯鐘舵�侊細0=寰呮敮浠橈紱1=宸叉敮浠�", example = "0")
@@ -155,6 +155,35 @@
@ApiModelProperty(value = "閰嶉�佽寖鍥�(km)")
private BigDecimal deliveryArea;
+
+ @ApiModelProperty(value = "褰撳墠浣欓(鍒�)")
+ private Long balance;
+
+ @ApiModelProperty(value = "鍘嗗彶鎬婚噾棰�(鍒�)")
+ private Long totalBalance;
+
+ @ApiModelProperty(value = "鏀粯瀹濇彁鐜拌处鎴�")
+ private String aliAccount;
+
+ @ApiModelProperty(value = "钀ヤ笟鏃堕棿")
+ private String shopHours;
+
+ @ApiModelProperty(value = "闂ㄥ簵浠嬬粛")
+ private String content;
+
+ @ApiModelProperty(value = "闂ㄥ簵澶村儚")
+ private String coverImg;
+
+ @ApiModelProperty(value = "瀵勫瓨绫诲瀷锛堥�楀彿鍒嗛殧鐨刢ategory涓婚敭锛�")
+ private String depositTypes;
+
+ @ApiModelProperty(value = "鏀惰垂鏍囧噯")
+ private String feeStandard;
+
+ @ApiModelProperty(value = "闂ㄥ簵钀ヤ笟绫诲瀷锛�0=闈炲叏澶╋紱1=鍏ㄥぉ", example = "0")
+ private Integer businessType;
+
+
// 闈炴寔涔呭寲锛氶檮浠跺垪琛�
@TableField(exist = false)
@ApiModelProperty(value = "闂ㄥ簵闂ㄥご鐓�", hidden = true)
@@ -186,4 +215,8 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private Date createEndTime;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "瀹℃壒鐘舵�佸垪琛�(鏌ヨ鐢紝閫楀彿鍒嗛殧)", example = "0,1,2")
+ private List<Integer> auditStatusList;
+
}
--
Gitblit v1.9.3