Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs

18516761980

2022-06-23 41fa9a0f2f5cd0ffc9bd96e11f00245ea3567b9b

 src/main/webapp/static/js/locMast/locMast.js

@@ -15,6 +15,7 @@
        limit: 16,
        limits: [16, 30, 50, 100, 200, 500],
        even: true,
        // size: 'sm',
        toolbar: '#toolbar',
        cellMinWidth: 50,
        cols: [[