Merge remote-tracking branch 'origin/dev_New' into dev_New

maven

6 天以前 577fd97c572af76ac2464543e74e7edc2c35ffa0

 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>