From bfa6af3b50fa16ed4f1d835f8f9fc9237c83e64c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期日, 27 四月 2025 17:26:32 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou into dev

---
 ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/entity/UserRecipient.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/entity/UserRecipient.java b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/entity/UserRecipient.java
index ba8900d..2eb83d4 100644
--- a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/entity/UserRecipient.java
+++ b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/entity/UserRecipient.java
@@ -55,6 +55,14 @@
     @TableField("isDefault")
     private Integer isDefault;
 
+    @ApiModelProperty("城市")
+    @TableField("city")
+    private String city;
+
+    @ApiModelProperty("城市code")
+    @TableField("city_code")
+    private String cityCode;
+
     @ApiModelProperty("经度")
     @TableField("longitude")
     private Double longitude;

--
Gitblit v1.7.1