Merge branch 'zjw'

imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/controller/equip/vo/EquipInfoRespVO.java

@@ -71,4 +71,6 @@ public class EquipInfoRespVO {
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     private LocalDateTime createTime;
 
+    @Schema(description = "运行状态")
+    private Integer runStatus;
 }

imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/mysql/equip/EquipInfoMapper.java

@@ -29,7 +29,8 @@ public interface EquipInfoMapper extends BaseMapperX<EquipInfoDO> {
                 .eqIfPresent(EquipInfoDO::getCustomerId, reqVO.getCustomerId())
                 .likeIfPresent(EquipInfoDO::getEquipNo, reqVO.getEquipNo())
                 .eqIfPresent(EquipInfoDO::getStatus, reqVO.getStatus())
-                .orderByDesc(EquipInfoDO::getCreateTime));
+                .groupBy(EquipInfoDO::getCustomerId, EquipInfoDO::getModelId)
+        );
     }
 
     default List<EquipSelectionVO> selection(){