From d7a8baeff8b0e68c54a959e5f46f639c54aad1d1 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 27 九月 2021 17:15:29 +0800
Subject: [PATCH] Merge branch 'test_bak' into 'master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopGoodsAttrDO.java |   26 ++++++++------------------
 1 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopGoodsAttrDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopGoodsAttrDO.java
index cdb7ec1..ea678e5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopGoodsAttrDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopGoodsAttrDO.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
@@ -62,7 +62,7 @@
     private String attrPic;
 
     /**
-     * 是否是默认规格(1.是  2.否)
+     * 是否是默认规格(1.是 2.否)
      */
     private Integer isDefault;
 
@@ -85,19 +85,9 @@
 
     @Override
     public String toString() {
-        return "ComShopGoodsAttrDO{" +
-                "id=" + id +
-                ", goodsId=" + goodsId +
-                ", storeId=" + storeId +
-                ", goodsName=" + goodsName +
-                ", goodsAttr=" + goodsAttr +
-                ", stock=" + stock +
-                ", sale=" + sale +
-                ", attrPic=" + attrPic +
-                ", isDefault=" + isDefault +
-                ", price=" + price +
-                ", createAt=" + createAt +
-                ", updateAt=" + updateAt +
-                "}";
+        return "ComShopGoodsAttrDO{" + "id=" + id + ", goodsId=" + goodsId + ", storeId=" + storeId + ", goodsName="
+            + goodsName + ", goodsAttr=" + goodsAttr + ", stock=" + stock + ", sale=" + sale + ", attrPic=" + attrPic
+            + ", isDefault=" + isDefault + ", price=" + price + ", createAt=" + createAt + ", updateAt=" + updateAt
+            + "}";
     }
 }
\ No newline at end of file

--
Gitblit v1.7.1