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 |    5 ++++-
 1 files changed, 4 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..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
@@ -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;
 

--
Gitblit v1.9.3