From d1fa8d11e65b97f4b8a0a9af0c776c12328ddcf8 Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期一, 17 三月 2025 14:58:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-2.0' into dev-2.0

---
 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/warpper/MgtComplaintQuery.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/warpper/MgtComplaintQuery.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/warpper/MgtComplaintQuery.java
index 29b0e95..1628258 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/warpper/MgtComplaintQuery.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/warpper/MgtComplaintQuery.java
@@ -19,14 +19,17 @@
 @ApiModel("管理后台诉求管理查询数据传输对象")
 public class MgtComplaintQuery extends BasePage {
     @ApiModelProperty(value = "录入人")
-    private String nickname;
+    private String reportUserName;
 
-    @ApiModelProperty(value = "联系方式")
-    private String phone;
+    @ApiModelProperty(value = "录入人联系方式")
+    private String reportUserPhone;
 
     @ApiModelProperty(value = "群众姓名")
     private String name;
 
+    @ApiModelProperty(value = "群众联系方式")
+    private String contactNumber;
+
     @ApiModelProperty(value = "发生时间-开始")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date startTime;

--
Gitblit v1.7.1