Merge branch '商家费用分账模式' into test

device-api-service/src/main/java/com/xy/service/DeviceAdminActivateServiceImpl.java

@@ -80,8 +80,6 @@ public class DeviceAdminActivateServiceImpl extends ServiceImpl<DeviceAdminActiv
             if (deviceInfo.getActiveState() == 1) {
                 throw new CommRuntimeException(deviceInfo.getDeviceId() + "已经激活,操作失败");
             }
-        });
-        deviceInfos.forEach(deviceInfo -> {
             //激活对象
             deviceInfo.setActiveState(activeState)
                     .setBusyState(busyState)