From 43ce77a85d8297a53dc25430fff10ead57296167 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期六, 04 十一月 2023 15:43:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-core/src/main/resources/mapper/SecServiceMapper.xml | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/igds-core/src/main/resources/mapper/SecServiceMapper.xml b/igds-core/src/main/resources/mapper/SecServiceMapper.xml
index 54c1ba8..3a18c75 100644
--- a/igds-core/src/main/resources/mapper/SecServiceMapper.xml
+++ b/igds-core/src/main/resources/mapper/SecServiceMapper.xml
@@ -8,23 +8,30 @@
<sql id="DATA_COLUMN">
ID_ as id,
+ SN_ AS sn,
COMPANY_ID_ as companyId,
DEPT_ID_ as deptId,
- NAME_ AS name,
- LOGIN_ID_
- AS loginId,
- PWD_ AS pwd,
- BRAND_ AS brand,
TYPE_ AS type,
PLAY_TYPE_ AS playType,
- SN_ AS sn,
+ SNAP_TYPE_ AS snapType,
+ spjklx AS spjklx,
+ spdwlx AS spdwlx,
+ NAME_ AS name,
+ LOGIN_ID_ AS loginId,
+ PWD_ AS pwd,
IP_IN_ AS ipIn,
PORT_IN_C_ AS portInC,
PORT_IN_V_ AS portInV,
CHAN_NUM_ AS chanNum,
+ BRAND_ AS brand,
MEDIA_ADDR_ AS mediaAddr,
+ PHONE_ADDR_ AS phoneAddr,
+ REMARK_ AS remark,
POS_X_ AS posX,
- POS_Y_ AS posY
+ POS_Y_ AS posY,
+ SCREEN_SHOW_ AS screenShow,
+ SNAP_TAG_ AS snapTag,
+ UPDATE_TIME_ AS updateTime
</sql>
<!-- 鏇存柊璁惧浣嶇疆 -->
--
Gitblit v1.9.3