From eda58e0e6d4abdd2b060e28867d103045845aa69 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 30 八月 2021 13:13:18 +0800
Subject: [PATCH] Merge branch 'test' into 'yuyue_dev'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoClassifyDO.java |   31 ++++++++++++-------------------
 1 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoClassifyDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoClassifyDO.java
index 6bf6aa9..d709870 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoClassifyDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoClassifyDO.java
@@ -1,13 +1,13 @@
 package com.panzhihua.service_community.model.dos;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
 import java.io.Serializable;
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import lombok.Data;
 
 /**
  * @auther lyq
@@ -57,24 +57,17 @@
      */
     private Date updateAt;
 
+    @Override
+    public String toString() {
+        return "ComActEasyPhotoClassifyDO{" + "id=" + id + ", name=" + name + ", status=" + status + ", weight="
+            + weight + ", remark=" + remark + ", createAt=" + createAt + ", updateAt=" + updateAt + "}";
+    }
+
     /**
      * 状态(1.启用 2.禁用)
      */
-    public interface status{
+    public interface status {
         int yes = 1;
         int no = 2;
-    }
-
-    @Override
-    public String toString() {
-        return "ComActEasyPhotoClassifyDO{" +
-                "id=" + id +
-                ", name=" + name +
-                ", status=" + status +
-                ", weight=" + weight +
-                ", remark=" + remark +
-                ", createAt=" + createAt +
-                ", updateAt=" + updateAt +
-                "}";
     }
 }
\ No newline at end of file

--
Gitblit v1.7.1