合并代码，解决冲突

zhangchao

2024-11-04 c28e6101a5e42a9cdcc51ef6b69599ea15fe2af9

 src/main/webapp/views/basErrLog/basErrLog.html

@@ -28,7 +28,7 @@
        <div class="layui-input-inline">
            <select name="status">
                <option value="" style="display: none"></option>
                <option value="1">未处理</option>
                <option value="1">待处理</option>
                <option value="2">已修复</option>
            </select>
        </div>