Merge branch 'refs/heads/rcs_master' into ctu_conveyor

zhang

2 天以前 af5081bc0d0668d526a204076557a171097ddb8d

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/ActionService.java

@@ -15,6 +15,8 @@

    List<Map<String, Object>> selectCountGroupByType();

    List<String> selectGroupNo(ActionStsType actionStsType);

    List<String> selectPrepareGroup();

    List<Long> selectTaskIdsByGroupId(String groupId);