From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopStoreDO.java | 53 +++++++++++++++++++----------------------------------
1 files changed, 19 insertions(+), 34 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopStoreDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopStoreDO.java
index a99bb52..867bba4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopStoreDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopStoreDO.java
@@ -1,12 +1,12 @@
package com.panzhihua.service_community.model.dos;
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
+import com.baomidou.mybatisplus.annotation.*;
+
+import lombok.Data;
/**
* @auther lyq
@@ -47,7 +47,7 @@
private String phone;
/**
- * 配送方式（1.商家配送 2.快递物流）
+ * 配送方式（1.商家配送 2.快递物流）
*/
private Integer deliveryType;
@@ -57,12 +57,12 @@
private String remark;
/**
- * 店铺状态（1.启用 2.禁用）
+ * 店铺状态（1.启用 2.禁用）
*/
private Integer status;
/**
- * 删除状态（1.未删除 2.已删除）
+ * 删除状态（1.未删除 2.已删除）
*/
private Integer deleteStatus;
@@ -122,43 +122,28 @@
*/
private Long sysUserId;
+ @Override
+ public String toString() {
+ return "ComShopStoreDO{" + "id=" + id + ", name=" + name + ", classifyId=" + classifyId + ", logo=" + logo
+ + ", phone=" + phone + ", deliveryType=" + deliveryType + ", remark=" + remark + ", status=" + status
+ + ", deleteStatus=" + deleteStatus + ", storeDescribe=" + storeDescribe + ", sale=" + sale + ", saleVolume="
+ + saleVolume + ", storeAccount=" + storeAccount + ", storePassword=" + storePassword + ", storeDetail="
+ + storeDetail + ", createBy=" + createBy + ", createAt=" + createAt + ", updateAt=" + updateAt + "}";
+ }
+
/**
- * 店铺状态（1.启用 2.禁用）
+ * 店铺状态（1.启用 2.禁用）
*/
- public interface status{
+ public interface status {
int yes = 1;
int no = 2;
}
/**
- * 删除状态（1.未删除 2.已删除）
+ * 删除状态（1.未删除 2.已删除）
*/
- public interface deleteStatus{
+ public interface deleteStatus {
int no = 1;
int yes = 2;
- }
-
- @Override
- public String toString() {
- return "ComShopStoreDO{" +
- "id=" + id +
- ", name=" + name +
- ", classifyId=" + classifyId +
- ", logo=" + logo +
- ", phone=" + phone +
- ", deliveryType=" + deliveryType +
- ", remark=" + remark +
- ", status=" + status +
- ", deleteStatus=" + deleteStatus +
- ", storeDescribe=" + storeDescribe +
- ", sale=" + sale +
- ", saleVolume=" + saleVolume +
- ", storeAccount=" + storeAccount +
- ", storePassword=" + storePassword +
- ", storeDetail=" + storeDetail +
- ", createBy=" + createBy +
- ", createAt=" + createAt +
- ", updateAt=" + updateAt +
- "}";
}
}
\ No newline at end of file
--
Gitblit v1.7.1