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

luxiaotao1123

2021-08-25 6cd9f18cd85472b5d7ccc0a6e0f6924da4dbd6e5

 src/main/webapp/static/js/matCode/matCode.js

@@ -445,7 +445,7 @@
        type: 'datetime'
    });
    layDate.render({
        elem: '#modiTime\\$',
        elem: 'modiTime#\\$',
        type: 'datetime'
    });
    layDate.render({