Merge remote-tracking branch 'origin/stasrs' into stasrs

野心家

2023-04-24 f96c2adc8d6bab6a4ee67a50ecfc9e6c7e435efd

 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: [[