Merge branch 'refs/heads/rcs_master' into jdxaj

zhang

昨天 70930071a49190f414c8d8bc9c9e9795a4096739

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/ActionMapper.java

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

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

    List<String> selectGroupNo(@Param("actionSts") Long actionSts);

    List<String> selectPrepareGroup();

    List<Long> selectTaskIdsByGroupId(@Param("groupId") String groupId);