From 0f549e83e9924de98614b287f42147e28edc5432 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 07 二月 2025 10:14:33 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/QXPDA

---
 Mst.master |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/Mst.master b/Mst.master
index 76c5e01..69266a0 100644
--- a/Mst.master
+++ b/Mst.master
@@ -11,7 +11,11 @@
     <script src="/Scripts/vue.min.js"></script>
     <script src="/Scripts/js.cookie.min.js"></script>
     <script src="/scripts/axios0.25.0.js"></script>
+<<<<<<< HEAD
     <script src="/scripts/config.js?<%=3455 %>"></script>
+=======
+    <script src="/scripts/config.js?<%=3475 %>"></script>
+>>>>>>> 033ef98f861148ffbff692a39ad0825f1e320326
     <link href="/scripts/vant/vant.css" rel="stylesheet" />
     <script src="/scripts/vant/vant.js"></script>
     <link href="/Images/Style.css?<%=1 %>" rel="stylesheet" />

--
Gitblit v1.9.3