Merge remote-tracking branch 'origin/20210716' into 20210716

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/DeviceMapper.xml

@@ -437,8 +437,8 @@
       rd.valve_status,
       rd.last_receive_time,
       rd.address,
-      rd.lng,
-      rd.lat,
+      ifnull(rd.lng,rc.lng) as lng,
+      ifnull(rd.lat,rc.lat) as lat,
       rd.user_name,
       rd.user_phone,
       rd.id_card,

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/ZoniotRmcpApplication.java

@@ -20,7 +20,7 @@ import java.net.UnknownHostException;
  * @version V1.0
  **/
 @EnableDiscoveryClient
-@SpringBootApplication(scanBasePackages="com.zcxk")
+@SpringBootApplication(scanBasePackages={"com.zcxk","com.bz.zoneiot"})
 @EnableSwagger2
 @MapperScan("com.zcxk.rmcp.core.dao")
 @Slf4j

zoniot-rmcp/zoniot-rmcp-web/src/main/resources/application-sit.properties

@@ -108,6 +108,8 @@ ribbon.ConnectTimeout=3000
 xxl.job.admin.addresses=http://10.0.0.62:8080/xxl-job-admin/
 xxl.job.group.id=1
 
+spring.main.allow-bean-definition-overriding=true
+