Merge branch 'master' into test

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

@@ -336,7 +336,7 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
                 .ge(DeviceData::getDateValue, pageByMercAndDate.getBeginDateValue())
                 .le(DeviceData::getDateValue, pageByMercAndDate.getEndDateValue())
                 .build()
-                .orderByDesc(DeviceData::getCreateTime);
+                .orderByDesc(DeviceData::getDeviceId, DeviceData::getDateValue);
         IPage<DeviceData> iPage = page(toIPage(pageBean), lambdaQueryWrapper);
         return R.ok(toPageBean(DeviceDataDto.Vo.class, iPage));
     }
@@ -348,8 +348,7 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
                 .in(DeviceData::getDeviceId)
                 .ge(DeviceData::getDateValue, pageByMercAndDate.getBeginDateValue())
                 .le(DeviceData::getDateValue, pageByMercAndDate.getEndDateValue())
-                .build()
-                .orderByDesc(DeviceData::getCreateTime);
+                .build();
         long count = count(lambdaQueryWrapper);
         return R.ok(count);
     }