From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1
---
src/main/resources/mapper/BasDevpMapper.xml | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/BasDevpMapper.xml b/src/main/resources/mapper/BasDevpMapper.xml
index 0546242..4f6e131 100644
--- a/src/main/resources/mapper/BasDevpMapper.xml
+++ b/src/main/resources/mapper/BasDevpMapper.xml
@@ -29,6 +29,9 @@
<result column="area" property="area" />
<result column="in_ok" property="inOk" />
<result column="out_ok" property="outOk" />
+ <result column="loc_type1" property="locType1" />
+ <result column="loc_type2" property="locType2" />
+ <result column="loc_type3" property="locType3" />
<result column="modi_user" property="modiUser" />
<result column="modi_time" property="modiTime" />
<result column="appe_user" property="appeUser" />
@@ -48,7 +51,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>
@@ -59,7 +62,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