From d8e7ad6acb9f6105ac6ff6fe2ce892e622cde256 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 18 三月 2025 22:11:24 +0800
Subject: [PATCH] Merge remote-tracking branch '喜望/dev-2.0' into dev-2.0
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/vo/ComplaintVO.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/vo/ComplaintVO.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/vo/ComplaintVO.java
index 2ffc8ce..01ad9c3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/vo/ComplaintVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/vo/ComplaintVO.java
@@ -1,7 +1,9 @@
package com.panzhihua.sangeshenbian.model.vo;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.panzhihua.sangeshenbian.model.entity.Complaint;
+import com.panzhihua.sangeshenbian.model.entity.ComplaintComment;
import com.panzhihua.sangeshenbian.model.entity.ComplaintFlow;
import com.panzhihua.sangeshenbian.model.entity.ComplaintProgress;
import io.swagger.annotations.ApiModel;
@@ -22,6 +24,9 @@
@ApiModelProperty(value = "上报人")
private String reporter;
+ @ApiModelProperty(value = "上报人联系方式")
+ private String reporterPhone;
+
@ApiModelProperty(value = "所属部门")
private String departmentName;
@@ -31,10 +36,10 @@
@ApiModelProperty(value = "上报说明")
private String comment;
- @ApiModelProperty(value = "录入人")
+ @ApiModelProperty(value = "录入人-弃用")
private String nickname;
- @ApiModelProperty(value = "联系方式")
+ @ApiModelProperty(value = "联系方式-弃用")
private String phone;
@ApiModelProperty(value = "审核人")
@@ -57,6 +62,9 @@
@ApiModelProperty(value = "审核按钮状态（0=显示，1=隐藏）")
private Integer auditButtonStatus;
+
+ @ApiModelProperty(value = "办结评价")
+ private ComplaintComment complaintComment;
@ApiModelProperty(value = "列表操作按钮状态（0=显示，1=隐藏）")
private Integer listControlsButtonStatus;
--
Gitblit v1.7.1