From f5b7a2eb5125b17d470c9b8e0b9bb6ac1654dbae Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 02 十一月 2024 11:16:02 +0800
Subject: [PATCH] 合并代码，解决冲突
---
src/main/webapp/static/js/agvWrkMastLog/wrkMastLogWithWrktype.js | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/webapp/static/js/agvWrkMastLog/wrkMastLogWithWrktype.js b/src/main/webapp/static/js/agvWrkMastLog/wrkMastLogWithWrktype.js
index 7e1ec4d..421f39a 100644
--- a/src/main/webapp/static/js/agvWrkMastLog/wrkMastLogWithWrktype.js
+++ b/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],
--
Gitblit v1.9.1