From 3b6e6d6dc6a6743a6b4ca7701dcb2ae1e6e7a26e Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 28 五月 2024 09:20:47 +0800
Subject: [PATCH] 解决冲突
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/MemberAddress.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/MemberAddress.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/MemberAddress.java
index bef22dd..60f9b62 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/MemberAddress.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/MemberAddress.java
@@ -70,5 +70,14 @@
@TableLogic
private Integer isDefault;
+ @ApiModelProperty(value = "省份/直辖市")
+ private String receiverProvince;
+
+ @ApiModelProperty(value = "省")
+ private String receiverCity;
+
+ @ApiModelProperty(value = "区")
+ private String receiverRegion;
+
}
--
Gitblit v1.7.1