From b1cbb59d39cea44d35110d95e54fbd86d4a12e13 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 01 八月 2025 12:55:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghjtasrs' into ghjtasrs
---
src/main/resources/mapper/WaitPakinLogMapper.xml | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/WaitPakinLogMapper.xml b/src/main/resources/mapper/WaitPakinLogMapper.xml
index feda05e..8aeb6d0 100644
--- a/src/main/resources/mapper/WaitPakinLogMapper.xml
+++ b/src/main/resources/mapper/WaitPakinLogMapper.xml
@@ -36,7 +36,7 @@
<result column="dead_time" property="deadTime" />
<result column="dead_warn" property="deadWarn" />
<result column="source" property="source" />
- <result column="check" property="check" />
+ <result column="inspect" property="inspect" />
<result column="danger" property="danger" />
<result column="status" property="status" />
@@ -47,6 +47,8 @@
<result column="appe_time" property="appeTime" />
<result column="appe_user" property="appeUser" />
<result column="memo" property="memo" />
+ <result column="roll_up" property="rollUp" />
+
</resultMap>
</mapper>
--
Gitblit v1.9.1