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/warpper/MessageNotificationList.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/warpper/MessageNotificationList.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/warpper/MessageNotificationList.java
index 1f8f97d..7e3752e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/warpper/MessageNotificationList.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/warpper/MessageNotificationList.java
@@ -14,13 +14,13 @@
 	@ApiModelProperty("标题")
 	private String title;
 	@ApiModelProperty("承办人")
-	private String undertaker;
+	private String undertakerUser;
 	@ApiModelProperty("电话")
 	private String phone;
 	@ApiModelProperty("所属单位id")
 	private Integer departmentId;
 	@ApiModelProperty("职位id")
-	private Integer positionId;
+	private Integer position;
 	@ApiModelProperty("页码")
 	private Integer pageNum;
 	@ApiModelProperty("每页数")

--
Gitblit v1.7.1