Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/BaseDeviceServiceImpl.java

@@ -119,7 +119,12 @@ public class BaseDeviceServiceImpl extends AbstractCrudService<BaseDeviceMapper,
         if(CollectionUtils.isNotEmpty(deviceList)){
             List<String> buildNumList = new ArrayList<>();
             for (int i = 0; i < deviceList.size(); i++) {
-                buildNumList.add(deviceList.get(i).getCompanyId());
+                if(buildNumList.contains(deviceList.get(i).getCompanyId())){
+
+                }else {
+                    buildNumList.add(deviceList.get(i).getCompanyId());
+                }
+
             }
             if(buildNumList.size() > 0){
                 LambdaQueryWrapper<BaseBuild> queryWrapper1 = Wrappers.lambdaQuery();

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/MidGridMemberVO.java

@@ -0,0 +1,2 @@
+package com.usky.fire.service.vo;public class MidGridMemberVO {
+}