From 06620a6b0e64126e216edab8fced4597b38936b3 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期一, 21 六月 2021 13:55:11 +0800
Subject: [PATCH] [修改]合并test_excel分支到test分支。解决部分冲突。
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopUserAddressDO.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 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 37f56e6..c59972a 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
@@ -81,6 +81,11 @@
private Integer isDefault;
/**
+ * 是否已删除（1.是 2.否）
+ */
+ private Integer deleteStatus;
+
+ /**
* 创建时间
*/
@TableField(fill = FieldFill.INSERT)
@@ -111,4 +116,12 @@
", updateAt=" + updateAt +
"}";
}
+
+ /**
+ * 是否是默认地址(1.是 2.否)
+ */
+ public interface isDefault{
+ int yes = 1;
+ int no = 2;
+ }
}
\ No newline at end of file
--
Gitblit v1.7.1