From ef270bd1855b5ce3f398c5df024840a498e33a8f Mon Sep 17 00:00:00 2001
From: MercuryZ <zdmisif@126.com>
Date: 星期四, 31 三月 2022 14:09:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dao/src/main/resources/mapper/PoleMapper.xml | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/dao/src/main/resources/mapper/PoleMapper.xml b/dao/src/main/resources/mapper/PoleMapper.xml
index cbe3bed..a0a356a 100644
--- a/dao/src/main/resources/mapper/PoleMapper.xml
+++ b/dao/src/main/resources/mapper/PoleMapper.xml
@@ -9,6 +9,7 @@
<result property="poleCode" column="pole_code" jdbcType="BIGINT"/>
<result property="poleName" column="pole_name" jdbcType="VARCHAR"/>
<result property="deviceType" column="device_type" jdbcType="INTEGER"/>
+ <result property="userId" column="user_id" jdbcType="BIGINT"/>
<result property="clientId" column="client_id" jdbcType="BIGINT"/>
<result property="province" column="province" jdbcType="VARCHAR"/>
<result property="city" column="city" jdbcType="VARCHAR"/>
@@ -25,10 +26,10 @@
<sql id="Base_Column_List">
id,pole_code,pole_name,
- device_type,client_id,province,
- city,region,address,
- lon,lat,device_code,
- on_line_state,binding_count,create_time,
- update_time
+ device_type,user_id,client_id,
+ province,city,region,
+ address,lon,lat,
+ device_code,on_line_state,binding_count,
+ create_time,update_time
</sql>
</mapper>
--
Gitblit v1.9.3