Merge remote-tracking branch 'origin/dev_2.5_optimize' into dev_2.5_optimize

# Conflicts:
#	src/main/java/com/glxp/api/req/inout/FilterCodeRequest.java

src/main/java/com/glxp/api/req/inout/FilterCodeRequest.java

@@ -63,6 +63,12 @@ public class FilterCodeRequest extends ListPageRequest {
      */
     private String packageLevel;
 
+
+    /**
+     * 单据类型
+     */
+    private String action;
+
     /**
      * 单据类型集合
      */

src/main/resources/mybatis/mapper/inout/IoCodeTempDao.xml

@@ -25,8 +25,9 @@
             <if test="relId != null and relId != ''">
                 AND ic.relId = #{relId}
             </if>
-
-
+            <if test="action != null and action != ''">
+                AND ic.action = #{action}
+            </if>
         </where>
         GROUP BY ic.id
     </select>