From f5e1051a7e6d3ffccc815a631d8be372d772c58f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 23 七月 2024 11:56:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index e4cd9e1..a9387f9 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -13,6 +13,7 @@
         <result column="yw_result" property="ywResult"/>
         <result column="yw_condition" property="ywCondition"/>
         <result column="yw_check_result" property="ywCheckResult"/>
+        <result column="overtime" property="overtime"/>
     </resultMap>
 
     <select id="page" resultType="com.ycl.platform.domain.vo.WorkOrderVO">

--
Gitblit v1.8.0