Merge remote-tracking branch 'origin/master'

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/vo/ObjectListQueryVO.java

@@ -44,5 +44,7 @@ public class ObjectListQueryVO implements Serializable {
 	@ApiModelProperty(value = "支持的巡检类型  0普通巡检，1视频自动巡检，2机器人巡检")
 	private String supportAutoVideo;
 
+    @ApiModelProperty(value = "所属机构")
+    private Long createDept;
 
 }

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ObjectController.java

@@ -101,6 +101,7 @@ public class ObjectController extends BladeController {
 		entity.setCode(object.getCode());
 		entity.setName(object.getName());
 		entity.setStatus(object.getStatus());
+		entity.setCreateDept(object.getCreateDept());
 		entity.setSupportAutoVideo(object.getSupportAutoVideo());
 		pages.setRecords(objectService.getListPage(pages,entity));
 		return R.data(pages);

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/controller/RiskCheckController.java

@@ -48,6 +48,7 @@ public class RiskCheckController extends BladeController {
     @ApiOperationSupport(order = 1)
     public R<IPage<RiskCheckVO>> page(RiskCheckDTO req, Query query) {
         LambdaQueryWrapper<RiskCheckEntity> queryWrapper = Condition.getQueryWrapper(RiskCheckEntity.class, BeanUtil.copy(req, RiskCheckEntity.class));
+        queryWrapper.orderByDesc(RiskCheckEntity::getUpdateTime,RiskCheckEntity::getCreateTime);
         IPage page = riskCheckService.page(Condition.getPage(query), queryWrapper);
         page.setRecords(RiskCheckWrapper.build().listVO(page.getRecords()));
         return R.data(page);