From d98e92ff3cd9bde1398d4f84a393da9397cb6e70 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Tue, 15 Jul 2025 19:57:04 +0800
Subject: [PATCH] Merge branch 'xin' into pxb
---
oying-system/src/main/java/com/oying/modules/sh/domain/UserAddress.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/sh/domain/UserAddress.java b/oying-system/src/main/java/com/oying/modules/sh/domain/UserAddress.java
index 91286d0..68b5161 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/domain/UserAddress.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/domain/UserAddress.java
@@ -6,7 +6,6 @@
import cn.hutool.core.bean.copier.CopyOptions;
import java.math.BigDecimal;
import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -28,7 +27,6 @@
@ApiModelProperty(value = "主键")
private Long addressId;
- @NotNull
@ApiModelProperty(value = "用户id")
private Long userId;
@@ -52,6 +50,10 @@
@ApiModelProperty(value = "街道")
private String street;
+ @ApiModelProperty(value = "短地址")
+ @NotBlank
+ private String shortAddress;
+
@NotBlank
@ApiModelProperty(value = "详细地址")
private String detail;
@@ -62,9 +64,8 @@
@ApiModelProperty(value = "纬度")
private BigDecimal latitude;
- @NotNull
- @ApiModelProperty(value = "是否默认")
- private Integer isDefault;
+ @ApiModelProperty(value = "是否默认: false")
+ private Boolean isDefault = false;
@NotBlank
@ApiModelProperty(value = "标签（家、公司等）")
--
Gitblit v1.9.3