Merge remote-tracking branch 'origin/dev/icss' into dev/icss

icssman-service/src/main/java/com/diagbot/facade/DeptVitalFacade.java

@@ -193,7 +193,7 @@ public class DeptVitalFacade extends DeptVitalServiceImpl {
      * @return
      */
     public IPage<DeptVitalDTO> getDeptVitalPage(DeptVitalPageVO deptVitalPageVO) {
-        QueryWrapper<DeptVital> deptVitalQueryWrapper = new QueryWrapper<>();
+        /*QueryWrapper<DeptVital> deptVitalQueryWrapper = new QueryWrapper<>();
         deptVitalQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
                 select("dept_id", "gmt_create", "creator", "gmt_modified", "modifier").
                 groupBy("dept_id", "gmt_create", "creator", "gmt_modified", "modifier");
@@ -233,7 +233,8 @@ public class DeptVitalFacade extends DeptVitalServiceImpl {
             }
         }
         page.setRecords(deptVitalDTOListRet);
-        return page;
+        return page;*/
+        return null;
     }
 
     /**