Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁

yuan

2 天以前 372d212912401059defe5fe83379c50d1033c06e

 src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml

@@ -76,6 +76,9 @@
            <if test="req.returnNo != null and req.returnNo != ''">
                and pro.no like concat('%',#{req.returnNo},'%')
            </if>
            <if test="req.supplierId != null">
                and pro.supplier_id = #{req.supplierId}
            </if>
            <if test="req.supplierName != null and req.supplierName != ''">
                and sm.supplier_name like concat('%',#{req.supplierName},'%')
            </if>