From 0ab77d6e1b6102b1fd14a134a9acb6d173f40d2b Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 01 十二月 2022 17:30:57 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleDO.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 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 22db755..272dd76 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
@@ -24,7 +24,7 @@
/**
* 主键id
*/
- @TableId(type = IdType.AUTO)
+ @TableId(type = IdType.ASSIGN_ID)
private Long id;
/**
@@ -93,6 +93,7 @@
@TableField(fill = FieldFill.INSERT)
private Date createAt;
+ private String instruction;
/**
* 最后回复时间
*/
@@ -152,7 +153,25 @@
private Date solveTime;
- private Integer dealStatus;
+ private Date commentTime;
+
+ private String comment;
+
+ private Integer orderType;
+
+ private Integer helpMemberType;
+
+ private String helpMemberContent;
+
+ private Integer helpOrgType;
+
+ private String helpOrgContent;
+
+ private Long solveUnitId;
+
+ private String realServiceTime;
+
+ private String targetServiceTime;
@Override
public String toString() {
--
Gitblit v1.7.1