From 59b1f0e9967902aa10f5e017d5a0bdfd1b60c9ea Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 29 四月 2026 09:42:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/dao/business/model/ShopInfo.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 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 4147f2a..b93c060 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
@@ -156,8 +156,17 @@
@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 aliName;
@ApiModelProperty(value = "钀ヤ笟鏃堕棿")
private String shopHours;
@@ -177,6 +186,9 @@
@ApiModelProperty(value = "闂ㄥ簵钀ヤ笟绫诲瀷锛�0=闈炲叏澶╋紱1=鍏ㄥぉ", example = "0")
private Integer businessType;
+ @ApiModelProperty(value = "鑺儴浜戞墦鍗版満SN缂栧彿")
+ private String printerSn;
+
// 闈炴寔涔呭寲锛氶檮浠跺垪琛�
@TableField(exist = false)
--
Gitblit v1.9.3