From 982313135d1c239fe3b20e4c5664781f92d40aca Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Thu, 31 Jul 2025 17:17:39 +0800
Subject: [PATCH] Merge branch 'master' into xin
---
oying-system/src/main/java/com/oying/modules/sh/domain/UserAddress.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 3460682..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;
@@ -51,6 +51,10 @@
@ApiModelProperty(value = "街道")
private String street;
+ @ApiModelProperty(value = "短地址")
+ @NotBlank
+ private String shortAddress;
+
@NotBlank
@ApiModelProperty(value = "详细地址")
private String detail;
@@ -61,7 +65,6 @@
@ApiModelProperty(value = "纬度")
private BigDecimal latitude;
- @NotNull
@ApiModelProperty(value = "是否默认: false")
private Boolean isDefault = false;
@@ -69,6 +72,10 @@
@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