合并代码，解决冲突

zhangchao

2024-11-04 c28e6101a5e42a9cdcc51ef6b69599ea15fe2af9

 src/main/webapp/static/js/agvWrkMastLog/wrkMastLogWithWrktype.js

@@ -12,7 +12,7 @@
    tableIns = table.render({
        elem: '#wrkMastLog',
        headers: {token: localStorage.getItem('token')},
        url: baseUrl+'/agv/wrkMastLog/list/auth',
        url: baseUrl+'/agv//wrkMastLogWithWrktype/list/auth',
        page: true,
        limit: 16,
        limits: [16, 30, 50, 100, 200, 500],