From 36f2f14ace300855a436f1ed9faf07049587a08f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 04 一月 2025 09:31:26 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java |   28 +++++++++++++++++++++++++++-
 1 files changed, 27 insertions(+), 1 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java
index afc03e9..8020f36 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java
@@ -118,6 +118,9 @@
     @TableField("lave_point")
     private Integer lavePoint;
 
+    @TableField(exist = false)
+    private Integer laveUsePoint;
+
     @ApiModelProperty(value = "门店分佣总金额")
     @TableField("giveaway_all_money")
     private BigDecimal giveawayAllMoney;
@@ -160,7 +163,6 @@
 
     @ApiModelProperty(value = "删除(0=否,1=是)")
     @TableField("del_flag")
-    @TableLogic
     private Integer delFlag;
 
     @ApiModelProperty(value = "添加时间")
@@ -168,5 +170,29 @@
     private LocalDateTime createTime;
 
 
+    @ApiModelProperty(value = "省")
+    @TableField("province")
+    private String province;
+
+    @ApiModelProperty(value = "省编号")
+    @TableField("province_code")
+    private String provinceCode;
+
+    @ApiModelProperty(value = "市")
+    @TableField("city")
+    private String city;
+
+    @ApiModelProperty(value = "市编号")
+    @TableField("city_code")
+    private String cityCode;
+
+    @ApiModelProperty(value = "区")
+    @TableField("district")
+    private String district;
+
+    @ApiModelProperty(value = "区编号")
+    @TableField("district_code")
+    private String districtCode;
+
 
 }

--
Gitblit v1.7.1