Merge branch 'refs/heads/dev_New' into dev_New_kthg

liding

昨天 1a3f5db043fd381b60a0a5f40687136274a2cbd1

 src/main/resources/mapper/approve/ApproveProcessMapper.xml

@@ -35,5 +35,8 @@
        <if test="req.approveStatus != null or req.approveStatus == 0">
            and approve_status = #{req.approveStatus}
        </if>
        <if test="req.approveType != null ">
            and approve_type = #{req.approveType}
        </if>
    </select>
</mapper>