Merge remote-tracking branch 'origin/master'

ludc

2023-09-06 6f35965af449ed77d0db4c4691a6b6e4a3aa8438

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java

@@ -32,6 +32,12 @@
   private IDockingLogeService dockingLogeService;

   /***
    * 集成任务服务
    */
   @Autowired( required = false)
   private IDockingTaskService dockingTaskService;

   /***
    * 集成接口头协议服务
    */
   @Autowired( required = false)
@@ -54,8 +60,7 @@
    */
   @Override
   public IPage<DockingTaskVO> gridDockingTask(DockingTask dockingTask, Query query) {
      IPage<DockingTask> pages=null;
//    IPage<DockingTask> pages=dockingTaskService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingTask));
      IPage<DockingTask> pages=dockingTaskService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingTask));
      return DockingTaskWrapper.build().pageVO(pages);
   }