feat：新增核查装备排序

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/utils/ObjTransUtil.java

@@ -362,8 +362,14 @@ public class ObjTransUtil {
         detailVo.setCheckUserBName(checkUserBName);
         detailVo.setUserAName(userAName);
         detailVo.setUserBName(userBName);
-        detailVo.setDevInLibrary(inLibVoList);
-        detailVo.setDevNotInLibrary(notInLibVoList);
+        detailVo.setDevInLibrary(inLibVoList.stream()
+                .sorted(Comparator.comparing(DeviceInLibVo::getModel)
+                        .thenComparing(DeviceInLibVo::getName))
+                .collect(toList()));
+        detailVo.setDevNotInLibrary(notInLibVoList.stream()
+                .sorted(Comparator.comparing(DeviceNotInLibVo::getModel)
+                        .thenComparing(DeviceNotInLibVo::getName))
+                .collect(toList()));
 
         String areaName = auService.findOne(AuExample.UnitId, detailDo.getCheckUnitId()).getName();
         detailVo.setCheckArea(areaName);