From c3811d01d1929a98a0f34f70ca187d82ee312dbb Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期三, 03 十一月 2021 17:26:50 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopGoodsDO.java | 60 ++++++++++++++++++++++--------------------------------------
1 files changed, 22 insertions(+), 38 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopGoodsDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopGoodsDO.java
index 2fcd17a..eb8327a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopGoodsDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopGoodsDO.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
@@ -53,7 +53,7 @@
private String images;
/**
- * 商品状态(1.出售中 2.已下架 3.回收站)
+ * 商品状态(1.出售中 2.已下架 3.回收站)
*/
@TableField("`status`")
private Integer status;
@@ -105,12 +105,12 @@
private String goodsDescribe;
/**
- * 配送方式（1.商家配送 2.快递物流）
+ * 配送方式（1.商家配送 2.快递物流）
*/
private Integer deliveryType;
/**
- * 删除状态（1.未删除 2.已删除）
+ * 删除状态（1.未删除 2.已删除）
*/
private Integer deleteStatus;
@@ -126,54 +126,38 @@
@TableField(fill = FieldFill.UPDATE)
private Date updateAt;
+ @Override
+ public String toString() {
+ return "ComShopGoodsDO{" + "id=" + id + ", typeId=" + typeId + ", name=" + name + ", storeId=" + storeId
+ + ", goodsPic=" + goodsPic + ", images=" + images + ", status=" + status + ", sale=" + sale
+ + ", originalPrice=" + originalPrice + ", price=" + price + ", unit=" + unit + ", order=" + order
+ + ", stock=" + stock + ", details=" + details + ", remark=" + remark + ", goodsDescribe=" + goodsDescribe
+ + ", deliveryType=" + deliveryType + ", deleteStatus=" + deleteStatus + ", createAt=" + createAt
+ + ", updateAt=" + updateAt + "}";
+ }
+
/**
- * 商品状态(1.出售中 2.已下架 3.回收站)
+ * 商品状态(1.出售中 2.已下架 3.回收站)
*/
- public interface status{
+ public interface status {
int sell = 1;
int lower = 2;
int recovery = 3;
}
/**
- * 删除状态（1.未删除 2.已删除）
+ * 删除状态（1.未删除 2.已删除）
*/
- public interface deleteStatus{
+ public interface deleteStatus {
int no = 1;
int yes = 2;
}
/**
- * 配送方式（1.商家配送 2.快递物流）
+ * 配送方式（1.商家配送 2.快递物流）
*/
- public interface deliveryType{
+ public interface deliveryType {
int store = 1;
int express = 2;
- }
-
- @Override
- public String toString() {
- return "ComShopGoodsDO{" +
- "id=" + id +
- ", typeId=" + typeId +
- ", name=" + name +
- ", storeId=" + storeId +
- ", goodsPic=" + goodsPic +
- ", images=" + images +
- ", status=" + status +
- ", sale=" + sale +
- ", originalPrice=" + originalPrice +
- ", price=" + price +
- ", unit=" + unit +
- ", order=" + order +
- ", stock=" + stock +
- ", details=" + details +
- ", remark=" + remark +
- ", goodsDescribe=" + goodsDescribe +
- ", deliveryType=" + deliveryType +
- ", deleteStatus=" + deleteStatus +
- ", createAt=" + createAt +
- ", updateAt=" + updateAt +
- "}";
}
}
\ No newline at end of file
--
Gitblit v1.7.1