Merge remote-tracking branch 'origin/wb' into qa

jinpengyong

2023-08-25 5242d687d4edcd6c0f7e10fb82b0e5505dbb3da3

 screen-manage/src/main/java/com/moral/api/service/impl/ServicesScopeServiceImpl.java

@@ -175,7 +175,9 @@
                    insertList.add(deviceId);
                }
            }
            servicesScopeDeviceMapper.insertBatch(addBoundaryBindDevice.getServicesScope().getId(),insertList);
            if (insertList.size()>0){
                servicesScopeDeviceMapper.insertBatch(addBoundaryBindDevice.getServicesScope().getId(),insertList);
            }
            servicesScopeDeviceQueryWrapper.notIn("device_id",deviceIdList);
            ServicesScopeDevice servicesScopeDevice = new ServicesScopeDevice();
            servicesScopeDevice.setIsDelete(Constants.DELETE);