Merge remote-tracking branch 'origin/master'

王佳豪

2021-06-05 b0cede2d821dddcbc519df5be14b6f5045dd4eca

 src/main/webapp/views/locMatStatus/locMatStatus.html

@@ -27,6 +27,7 @@
    <div class="layui-inline">
        <select id="matStatusSelect" name="mat_status">
            <option value="">请选择物料状态</option>
            <option value="0">待检</option>
            <option value="1">良品</option>
            <option value="2">不良品</option>
        </select>