Merge remote-tracking branch 'origin/master'

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/productionReadyCenter/BoxController.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.zuihou.base.request.PageParams;
 import com.github.zuihou.business.productionReadyCenter.dto.*;
 import com.github.zuihou.business.productionReadyCenter.entity.Box;
-import com.github.zuihou.business.productionReadyCenter.entity.Tray;
 
 import com.github.zuihou.base.controller.SuperController;
 import com.github.zuihou.base.R;
@@ -42,6 +41,7 @@ public class BoxController extends SuperController<BoxService, Long, Box, BoxPag
 
         wrapper.like(Box::getName,box.getName())
                 .eq(Box::getStatus,box.getStatus())
+                .orderByDesc(Box::getStatus)
                 .orderByAsc(Box::getCode);
         super.query(params, page, defSize);
     }
@@ -64,7 +64,7 @@ public class BoxController extends SuperController<BoxService, Long, Box, BoxPag
     }
 
 
-    @ApiOperation(value = "修改状态", notes = "修改状态")
+    @ApiOperation(value = "修改审批状态", notes = "修改审批状态")
     @PostMapping("/updateStatus")
     public R<Box> updateStatus(@RequestBody BoxUpdateDTO model) {
         Box box  = baseService.updateStatus(model);