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

cjl

2023-10-19 2a4a9ef52b0d76efb9712fd8d4268f658546f99f

 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);