Merge remote-tracking branch 'origin/main'

ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeBikeQrController.java

@@ -75,7 +75,7 @@ public class EbikeBikeQrController {
     public JsonResult<?> page(PageParam pageParam, String bikeQrCode) {
         QueryWrapper queryWrapper = QueryWrapper.create()
                 .where(EBIKE_BIKE_QR.BIKE_QR_CODE.like(bikeQrCode, StringUtil.hasText(bikeQrCode)))
-                .orderBy(EBIKE_BIKE_QR.CREATED_AT,Boolean.TRUE)
+                .orderBy(EBIKE_BIKE_QR.BIKE_QR_CODE,Boolean.TRUE)
                 .orderBy(EBIKE_BIKE_QR.CREATED_AT,Boolean.FALSE);
         Page<EbikeBikeQr> page = ebikeBikeQrService.page(pageParam.getPage(), queryWrapper);
         return JsonResult.success(page);