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

buhuazhen

3 天以前 4e833109c2105bf6895ac985205ce30da37c70d6

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

 src/main/resources/mapper/procurementrecord/ReturnManagementMapper.xml

@@ -27,7 +27,7 @@
                and sl.salesman like concat('%',#{req.salesman},'%')
            </if>
            <if test="req.shippingNo != null and req.shippingNo != ''">
                and rm.shipping_no like concat('%',#{req.shippingNo},'%')
                and si.shipping_no like concat('%',#{req.shippingNo},'%')
            </if>
            <if test="req.projectStage != null and req.projectStage != ''">
                and rm.project_stage like concat('%',#{req.projectStage},'%')