From a52f8c508d08014d1a153cfc02e12b5fc185a3a4 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 11 七月 2024 15:28:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/dao/business/model/Shop.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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..c58df25 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
@@ -115,11 +115,11 @@
@ApiModelProperty(value = "鎵�灞炲叧鑱擣鐮�", example = "1")
@ExcelColumn(name="鎵�灞炲叧鑱擣鐮�")
- private Integer fcode;
+ private String fcode;
@ApiModelProperty(value = "鎵�灞炲叧鑱擲鐮�", example = "1")
@ExcelColumn(name="鎵�灞炲叧鑱擲鐮�")
- private Integer scode;
+ private String scode;
@ApiModelProperty(value = "娉ㄥ唽鍦�" )
@ExcelColumn(name="娉ㄥ唽鍦�")
private String regAddr;
@@ -200,6 +200,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;
--
Gitblit v1.9.3