From 28e8b38e9de8cc76084d0af6a96d2d9d1e1f739f Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 27 十月 2022 13:28:32 +0800
Subject: [PATCH] Merge branch 'local_20221024' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoFeedbackDO.java | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoFeedbackDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoFeedbackDO.java
index 8b2ceb8..bc87e6b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoFeedbackDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoFeedbackDO.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
@@ -24,7 +24,7 @@
/**
* 主键id
*/
- @TableId(type = IdType.AUTO)
+ @TableId(type = IdType.ASSIGN_ID)
private Long id;
/**
@@ -52,15 +52,14 @@
*/
private Long createBy;
+ /**
+ * 反馈人员类型（1.普通反馈 2.人大代表反馈）
+ */
+ private Integer type;
+
@Override
public String toString() {
- return "ComActEasyPhotoFeedbackDO{" +
- "id=" + id +
- ", easyId=" + easyId +
- ", feedbackContent=" + feedbackContent +
- ", feedbackImg=" + feedbackImg +
- ", createAt=" + createAt +
- ", createBy=" + createBy +
- "}";
+ return "ComActEasyPhotoFeedbackDO{" + "id=" + id + ", easyId=" + easyId + ", feedbackContent=" + feedbackContent
+ + ", feedbackImg=" + feedbackImg + ", createAt=" + createAt + ", createBy=" + createBy + "}";
}
}
\ No newline at end of file
--
Gitblit v1.7.1