From 2f084c24fcc1c42e401edde4c8c6939d53c94764 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 25 二月 2025 00:08:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/vo/ComplaintVO.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 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 45a7c66..edd05fa 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.panzhihua.sangeshenbian.model.entity.Complaint;
 import com.panzhihua.sangeshenbian.model.entity.ComplaintFlow;
+import com.panzhihua.sangeshenbian.model.entity.ComplaintProgress;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -19,7 +20,7 @@
 public class ComplaintVO extends Complaint {
 
     @ApiModelProperty(value = "上报人")
-    private String reportName;
+    private String reporter;
 
     @ApiModelProperty(value = "所属部门")
     private String departmentName;
@@ -30,6 +31,15 @@
     @ApiModelProperty(value = "上报说明")
     private String comment;
 
+    @ApiModelProperty(value = "录入人")
+    private String nickname;
+
+    @ApiModelProperty(value = "联系方式")
+    private String phone;
+
     @ApiModelProperty(value = "诉求流转记录")
     List<ComplaintFlow> complaintFlows;
+
+    @ApiModelProperty(value = "办理进度")
+    List<ComplaintProgress> complaintProgresses;
 }

--
Gitblit v1.7.1