From 0526acc407572d23b1030e0ffd842406ae0bc121 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Wed, 16 Jul 2025 18:20:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pxb' into xin
---
oying-system/src/main/java/com/oying/modules/sh/domain/UserAddress.java | 16 +++++++++++-----
1 files changed, 11 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..b608f37 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
@@ -1,12 +1,12 @@
package com.oying.modules.sh.domain;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.oying.base.BaseEntity;
import cn.hutool.core.bean.BeanUtil;
import io.swagger.annotations.ApiModelProperty;
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 +28,6 @@
@ApiModelProperty(value = "主键")
private Long addressId;
- @NotNull
@ApiModelProperty(value = "用户id")
private Long userId;
@@ -52,6 +51,10 @@
@ApiModelProperty(value = "街道")
private String street;
+ @ApiModelProperty(value = "短地址")
+ @NotBlank
+ private String shortAddress;
+
@NotBlank
@ApiModelProperty(value = "详细地址")
private String detail;
@@ -62,14 +65,17 @@
@ApiModelProperty(value = "纬度")
private BigDecimal latitude;
- @NotNull
- @ApiModelProperty(value = "是否默认")
- private Integer isDefault;
+ @ApiModelProperty(value = "是否默认: false")
+ private Boolean isDefault = false;
@NotBlank
@ApiModelProperty(value = "标签（家、公司等）")
private String tag;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "距离")
+ private BigDecimal distance;
+
public void copy(UserAddress source){
BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
}
--
Gitblit v1.9.3