From 53e0cba6de254a1d6f19d0287da0b212f4a5ae90 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 16 七月 2024 17:22:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/service/src/main/java/com/doumee/dao/business/model/Shop.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Shop.java b/server/service/src/main/java/com/doumee/dao/business/model/Shop.java
index ce9b58c..d9e6717 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Shop.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Shop.java
@@ -203,6 +203,15 @@
     @ExcelColumn(name="鍦板潃")
     private String address;
 
+    @ApiModelProperty(value = "鑱旂郴鐢佃瘽")
+    @ExcelColumn(name="鑱旂郴鐢佃瘽")
+    private String linkPhone;
+
+
+    @ApiModelProperty(value = "鑱旂郴浜�")
+    @ExcelColumn(name="鑱旂郴浜�")
+    private String linkerName;
+
     @ApiModelProperty(value = "鐖剁骇閮ㄩ棬绾у埆璺緞", example = "1")
     @TableField(exist = false)
     private String parentIdPath;
@@ -239,4 +248,7 @@
     @TableField(exist = false)
     private List<Users> usersList;
 
+    @ApiModelProperty(value = "闂ㄥ簵缁忚惀鑼冨洿", example = "1")
+    @TableField(exist = false)
+    private List<String> seqNameList;
 }

--
Gitblit v1.9.3