Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

chen.lin

2 天以前 ecd5b6b51b7ddc4efe63c49c3c68adb276a2a2cb

 rsf-server/src/main/resources/mapper/manager/MatnrMapper.xml

@@ -32,6 +32,7 @@
            `valid_warn`,
            `flag_check`
        from man_matnr
        where deleted = 0
        ${ew.customSqlSegment}
    </select>
</mapper>