From a5e8dc52dbf29b0ea4b39c00bfe8f88efb6aa76c Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 28 九月 2021 20:58:41 +0800
Subject: [PATCH] Merge branch 'test_bak' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopUserAddressDO.java | 35 ++++++++++++-----------------------
1 files changed, 12 insertions(+), 23 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopUserAddressDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopUserAddressDO.java
index c59972a..671f389 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopUserAddressDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopUserAddressDO.java
@@ -1,11 +1,11 @@
package com.panzhihua.service_community.model.dos;
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-
import java.io.Serializable;
import java.util.Date;
+import com.baomidou.mybatisplus.annotation.*;
+
+import lombok.Data;
/**
* @auther lyq
@@ -76,12 +76,12 @@
private String detailAddress;
/**
- * 是否是默认地址(1.是 2.否)
+ * 是否是默认地址(1.是 2.否)
*/
private Integer isDefault;
/**
- * 是否已删除（1.是 2.否）
+ * 是否已删除（1.是 2.否）
*/
private Integer deleteStatus;
@@ -99,28 +99,17 @@
@Override
public String toString() {
- return "ComShopUserAddressDO{" +
- "id=" + id +
- ", userId=" + userId +
- ", name=" + name +
- ", phone=" + phone +
- ", provinceCode=" + provinceCode +
- ", provinceName=" + provinceName +
- ", cityCode=" + cityCode +
- ", cityName=" + cityName +
- ", districtCode=" + districtCode +
- ", districtName=" + districtName +
- ", detailAddress=" + detailAddress +
- ", isDefault=" + isDefault +
- ", createAt=" + createAt +
- ", updateAt=" + updateAt +
- "}";
+ return "ComShopUserAddressDO{" + "id=" + id + ", userId=" + userId + ", name=" + name + ", phone=" + phone
+ + ", provinceCode=" + provinceCode + ", provinceName=" + provinceName + ", cityCode=" + cityCode
+ + ", cityName=" + cityName + ", districtCode=" + districtCode + ", districtName=" + districtName
+ + ", detailAddress=" + detailAddress + ", isDefault=" + isDefault + ", createAt=" + createAt + ", updateAt="
+ + updateAt + "}";
}
/**
- * 是否是默认地址(1.是 2.否)
+ * 是否是默认地址(1.是 2.否)
*/
- public interface isDefault{
+ public interface isDefault {
int yes = 1;
int no = 2;
}
--
Gitblit v1.7.1