Merge remote-tracking branch 'origin/master'

nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/mapper/xml/RegionInfoMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.nu.modules.tplink.region.mapper.RegionInfoMapper">
 
     <select id="getByRegionId" parameterType="java.util.Map" resultType="com.nu.modules.tplink.region.entity.RegionInfo">
-        select id,
+        select a.id,
                a.region_id as regionId,
                a.region_name as regionName,
                a.region_level as regionLevel,
@@ -19,7 +19,7 @@
                a.media_server_id as mediaServerId,
                a.backup_media_server_id as backupMediaServerId,
                a.bind_type as bindType
-        from nu_iot_tplink_region a,
+        from nu_iot_tplink_region a
         left join nu_iot_tplink_region p on a.parent_id = p.region_id
         where a.region_id = #{regionId}
     </select>