From 20b11236b4364034f52df294b9240776f539ede1 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 16 七月 2024 14:49:01 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
server/service/src/main/java/com/doumee/dao/business/model/Shop.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 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 c58df25..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;
@@ -120,7 +122,7 @@
@ApiModelProperty(value = "鎵�灞炲叧鑱擲鐮�", example = "1")
@ExcelColumn(name="鎵�灞炲叧鑱擲鐮�")
private String scode;
- @ApiModelProperty(value = "娉ㄥ唽鍦�" )
+ @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;
@@ -215,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