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

jinpengyong

2023-08-31 e77cdf62567ba92d2d3131da20429dcbfc3b7ea2

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