From f2070facdb5715e7349df69cfe257289c680d292 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期三, 23 四月 2025 18:12:46 +0800
Subject: [PATCH] 前端联调
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java | 47 +++++++++++++++--------------------------------
1 files changed, 15 insertions(+), 32 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 886a770..ac9e958 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
@@ -34,13 +34,11 @@
@TableField("name")
private String name;
- @ApiModelProperty(value = "上级门店id")
- @TableField("pid")
- private Integer pid;
- @ApiModelProperty(value = "营业星期：1-周一到周日 2-周一周五 3-仅周末")
- @TableField("business_date")
- private Integer businessDate;
+
+ @ApiModelProperty(value = "营业时间")
+ @TableField("business_time")
+ private String businessTime;
@ApiModelProperty(value = "开始时间（HH:mm）")
@TableField("start_time")
@@ -70,7 +68,7 @@
@TableField("app_user_id")
private Long appUserId;
- @ApiModelProperty(value = "客户电话（同步到t_phone表）")
+ @ApiModelProperty(value = "客服电话（同步到t_phone表）")
@TableField("service_tel")
private String serviceTel;
@@ -86,9 +84,15 @@
@TableField("latitude")
private String latitude;
+ @ApiModelProperty(value = "商家地址")
+ @TableField("detail_address")
+ private String detailAddress;
+
@ApiModelProperty(value = "详细地址")
@TableField("address")
private String address;
+
+
@ApiModelProperty(value = "状态（1=正常，2=冻结）")
@TableField("status")
@@ -105,8 +109,8 @@
@ApiModelProperty(value = "已提现金额")
@TableField("withdraw_money")
private BigDecimal withdrawMoney;
- @ApiModelProperty(value = "审核中金额")
- @TableField(exist = false)
+ @ApiModelProperty(value = "c")
+ @TableField("withdraw_audit_money")
private BigDecimal withdrawAuditMoney;
@ApiModelProperty(value = "余额")
@@ -148,29 +152,8 @@
private String receiverBankChannelNo;
- @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;
+ @TableField(exist = false)
+ private String fullAddress;
@TableField(exist = false)
private Double distance;
--
Gitblit v1.7.1