Merge branch 'wanghaicheng' of lift-manager/lift-server into develop

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/controller/ScanRecordController.java

@@ -42,7 +42,7 @@ public class ScanRecordController {
      */
     @PostMapping("lift/detail")
     public RestResponse detail(@RequestBody LiftRequest request) {
-        Object response = liftService.detail(request.getLiftId(), null);
+        Object response = liftService.detail(request.getId(), null);
         if (ObjectUtil.isEmpty(response)) {
             return RestResponse.success();
         }

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/option/controller/MaintenanceOptionController.java

@@ -64,9 +64,9 @@ public class MaintenanceOptionController {
         String sort = null;
         if (category == 4 || category == 5) {
             req.setLiftCategory(3);
+            sort = "-1,1";
         }
         if (category == 3) {
-            sort = "-1,1";
             req.setLiftCategory(4);
         }
         List<MaintenanceOption> options = optionService.list(