Merge branch 'refs/heads/master' into mode-min-unit

cx-aps/cx-aps-common/src/main/resources/mybatis/ApsProcessOperationProcessEquDao.xml

@@ -53,9 +53,9 @@
             <foreach collection="ids" separator="," open="(" close=")" item="id">
                 #{id}
             </foreach>
-            <if test="nextProcessesIds != null and nextProcessesIds.size()>0">
+            <if test="nextIds != null and nextIds.size()>0">
                and ID in
-                <foreach collection="nextProcessesIds" separator="," open="(" close=")" item="id">
+                <foreach collection="nextIds" separator="," open="(" close=")" item="id">
                     #{id}
                 </foreach>
             </if>