From b04753affc29f1042d0eb75b0af87824a0f4a8aa Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 09 八月 2024 15:41:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-server/src/main/resources/mapper/zgyw/NotifyMapper.xml |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/ycl-server/src/main/resources/mapper/zgyw/NotifyMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/NotifyMapper.xml
index 3d6cd46..19351f9 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/NotifyMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/NotifyMapper.xml
@@ -9,10 +9,9 @@
         <result column="update_time" property="updateTime" />
         <result column="notify_type" property="notifyType" />
         <result column="content" property="content" />
-        <result column="notify_who" property="notifyWho" />
         <result column="readed" property="readed" />
         <result column="urgent" property="urgent" />
-        <result column="work_order_id" property="workOrderId" />
+        <result column="work_order_id" property="workOrderNo" />
     </resultMap>
 
 </mapper>

--
Gitblit v1.8.0