Merge remote-tracking branch 'origin/master' into test

device-api-service-merc-mini/src/main/java/com/xy/controller/MercMiniDeviceDataController.java

@@ -41,7 +41,7 @@ public class MercMiniDeviceDataController {
         dto.setMercId(MercAuthUtils.getMercId());
         if (Emptys.check(dto.getDeviceId())) {
             dto.setMercDeviceIds(CollUtil.newArrayList(dto.getDeviceId()));
-        }else{
+        } else {
             List<Long> mercDeviceIds = getMercDeviceIds();
             if (CollUtil.isEmpty(mercDeviceIds)) {
                 return R.ok(new PageBean<>());
@@ -57,7 +57,7 @@ public class MercMiniDeviceDataController {
         dto.setMercId(MercAuthUtils.getMercId());
         if (Emptys.check(dto.getDeviceId())) {
             dto.setMercDeviceIds(CollUtil.newArrayList(dto.getDeviceId()));
-        }else{
+        } else {
             List<Long> mercDeviceIds = getMercDeviceIds();
             if (CollUtil.isEmpty(mercDeviceIds)) {
                 return R.ok(new DeviceDataDayDto.SumCountVo());