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/BasDevpMapper.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/BasDevpMapper.xml b/src/main/resources/mapper/BasDevpMapper.xml
index b00be22..7cd9d8e 100644
--- a/src/main/resources/mapper/BasDevpMapper.xml
+++ b/src/main/resources/mapper/BasDevpMapper.xml
@@ -41,6 +41,8 @@
<result column="max_wt" property="maxWt" />
<result column="gross_wt" property="grossWt" />
<result column="cart_pos" property="cartPos" />
+ <result column="report_sign" property="reportSign" />
+ <result column="empty_mk" property="emptyMk" />
</resultMap>
@@ -51,7 +53,7 @@
left join asr_sta_desc asd on abd.dev_no = asd.stn_no
where 1=1
and asd.type_no = #{typeNo}
- and abd.in_enable = 'Y'
+ -- and abd.in_enable = 'Y'
group by abd.dev_no
</select>
@@ -62,7 +64,7 @@
left join asr_sta_desc asd on abd.dev_no = asd.stn_no
where 1=1
and asd.type_no = #{typeNo}
- and abd.out_enable = 'Y'
+ -- and abd.out_enable = 'Y'
group by abd.dev_no
</select>
--
Gitblit v1.9.1