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/ComActNeighborCircleDO.java |   42 ++++++++++++++++--------------------------
 1 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleDO.java
index 7cc0312..78e659c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleDO.java
@@ -1,11 +1,11 @@
 package com.panzhihua.service_community.model.dos;
 
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-
 import java.io.Serializable;
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.*;
+
+import lombok.Data;
 
 /**
  * @auther lyq
@@ -117,14 +117,23 @@
     private Long topicId;
 
     /**
-     * 发布类型(1.小程序发布  2.后台发布)
+     * 发布类型(1.小程序发布 2.后台发布)
      */
     private Integer type;
+
+    @Override
+    public String toString() {
+        return "ComActNeighborCircleDO{" + "id=" + id + ", releaseId=" + releaseId + ", releasePhone=" + releasePhone
+            + ", communityId=" + communityId + ", releaseContent=" + releaseContent + ", releaseImages=" + releaseImages
+            + ", status=" + status + ", refuseReason=" + refuseReason + ", commentNum=" + commentNum + ", fabulousNum="
+            + fabulousNum + ", forwardNum=" + forwardNum + ", isBoutique=" + isBoutique + ", createAt=" + createAt
+            + "}";
+    }
 
     /**
      * 发布状态(1.待审核 2.显示 3.隐藏 4.驳回)
      */
-    public interface status{
+    public interface status {
         int dsh = 1;
         int xs = 2;
         int yc = 3;
@@ -132,29 +141,10 @@
     }
 
     /**
-     * 发布类型(1.小程序发布  2.后台发布)
+     * 发布类型(1.小程序发布 2.后台发布)
      */
-    public interface type{
+    public interface type {
         int mini = 1;
         int admin = 2;
-    }
-
-    @Override
-    public String toString() {
-        return "ComActNeighborCircleDO{" +
-                "id=" + id +
-                ", releaseId=" + releaseId +
-                ", releasePhone=" + releasePhone +
-                ", communityId=" + communityId +
-                ", releaseContent=" + releaseContent +
-                ", releaseImages=" + releaseImages +
-                ", status=" + status +
-                ", refuseReason=" + refuseReason +
-                ", commentNum=" + commentNum +
-                ", fabulousNum=" + fabulousNum +
-                ", forwardNum=" + forwardNum +
-                ", isBoutique=" + isBoutique +
-                ", createAt=" + createAt +
-                "}";
     }
 }
\ No newline at end of file

--
Gitblit v1.7.1