Merge remote-tracking branch 'origin/master'

王佳豪

2021-06-05 b0cede2d821dddcbc519df5be14b6f5045dd4eca

 src/main/webapp/static/js/locNormal/normalReport.js

@@ -117,6 +117,8 @@
    form.on('submit(reset)', function (data) {
        pageCurr = 1;
        clearFormVal($('#search-box'));
        $("#state").val("1");
        form.render();
        tableReload(false);
    });