From 74b2581c8a9be309ca6454da3ff2c56501368771 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期四, 09 一月 2025 09:30:21 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 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 1745681..8027bea 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 @@ -190,5 +190,30 @@ 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 Double distance; } -- Gitblit v1.7.1