Merge branch 'master' into test

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

@@ -33,7 +33,9 @@ public class DeviceChargingHistoryServiceImpl extends ServiceImpl<DeviceCharging
     @Override
     @ApiOperation("分页查询")
     public R<PageBean<DeviceChargingHistoryDto.Vo>> page(DeviceChargingHistoryDto.Page page) {
-        LambdaQueryWrapper<DeviceChargingHistory> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(page, DeviceChargingHistory.class).build();
+        LambdaQueryWrapper<DeviceChargingHistory> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(page, DeviceChargingHistory.class)
+                .build()
+                .orderByDesc(DeviceChargingHistory::getCreateTime);
         IPage<DeviceChargingHistory> iPage = page(PlusBeans.toIPage(page.getPage()), lambdaQueryWrapper);
         return R.ok(toPageBean(DeviceChargingHistoryDto.Vo.class, iPage));
     }