From b0b94a084ed6c1a685caebb8dfb1a0d65fdd9ef6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 16 七月 2024 10:57:42 +0800
Subject: [PATCH] 提交

---
 server/service/src/main/java/com/doumee/dao/business/model/Shop.java |   33 ++++++++++++++++++++++++++++++---
 1 files changed, 30 insertions(+), 3 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 515b040..ce9b58c 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
@@ -9,6 +9,8 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -115,12 +117,12 @@
 
     @ApiModelProperty(value = "鎵�灞炲叧鑱擣鐮�", example = "1")
     @ExcelColumn(name="鎵�灞炲叧鑱擣鐮�")
-    private Integer fcode;
+    private String fcode;
 
     @ApiModelProperty(value = "鎵�灞炲叧鑱擲鐮�", example = "1")
     @ExcelColumn(name="鎵�灞炲叧鑱擲鐮�")
-    private Integer scode;
-    @ApiModelProperty(value = "娉ㄥ唽鍦�" )
+    private String scode;
+    @ApiModelProperty(value = "娉ㄥ唽鍦�(IAM)" )
     @ExcelColumn(name="娉ㄥ唽鍦�")
     private String regAddr;
     @ApiModelProperty(value = "娉曚汉韬唤璇佸彿" )
@@ -188,6 +190,19 @@
     @ApiModelProperty(value = "閮ㄩ棬绾у埆璺緞", example = "1")
     @ExcelColumn(name="閮ㄩ棬绾у埆璺緞")
     private String namePath;
+
+    @ApiModelProperty(value = "缁忓害", example = "1")
+    @ExcelColumn(name="缁忓害")
+    private BigDecimal longitude;
+
+    @ApiModelProperty(value = "绾害", example = "1")
+    @ExcelColumn(name="绾害")
+    private BigDecimal latitude;
+
+    @ApiModelProperty(value = "鍦板潃")
+    @ExcelColumn(name="鍦板潃")
+    private String address;
+
     @ApiModelProperty(value = "鐖剁骇閮ㄩ棬绾у埆璺緞", example = "1")
     @TableField(exist = false)
     private String parentIdPath;
@@ -200,6 +215,9 @@
     @ApiModelProperty(value = "鐖剁骇閮ㄩ棬绾у埆绫诲瀷 ", example = "1")
     @TableField(exist = false)
     private String parentType;
+    @ApiModelProperty(value = "瀹㈡埛绫诲瀷缂栫爜 ", example = "1")
+    @ExcelColumn(name="瀹㈡埛绫诲瀷缂栫爜锛屽涓娇鐢╗]鍒嗚瀛樻斁")
+    private String siteCode;
     @ApiModelProperty(value = "涓嬬骇鐩存帴閮ㄩ棬鏁伴噺 ", example = "1")
     @TableField(exist = false)
     private int childNum;
@@ -212,4 +230,13 @@
     @ApiModelProperty(value = "涓嬬骇閮ㄩ棬闆嗗悎", example = "1")
     @TableField(exist = false)
     private List<Shop> childList;
+
+    @ApiModelProperty(value = "璺濈 ", example = "1")
+    @TableField(exist = false)
+    private BigDecimal distance;
+
+    @ApiModelProperty(value = "闂ㄥ簵瀵艰喘鍒楄〃 ", example = "1")
+    @TableField(exist = false)
+    private List<Users> usersList;
+
 }

--
Gitblit v1.9.3