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/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 7d7fe57..2a12a65 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,7 +117,7 @@
private Long topicId;
/**
- * 发布类型（1.小程序发布 2.后台发布）
+ * 发布类型（1.小程序发布 2.后台发布）
*/
private Integer type;
@@ -131,10 +131,19 @@
*/
private Integer isDel;
+ @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;
@@ -142,9 +151,9 @@
}
/**
- * 发布类型（1.小程序发布 2.后台发布）
+ * 发布类型（1.小程序发布 2.后台发布）
*/
- public interface type{
+ public interface type {
int mini = 1;
int admin = 2;
}
@@ -155,24 +164,5 @@
public interface isDel{
int yes = 1;
int no = 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