From 7296835f8b7992a94e7f50cfa94331ab0e83b212 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期一, 10 二月 2025 09:14:02 +0800
Subject: [PATCH] 1.生产领料优化 “拆分领料”。
---
Mst.master | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/Mst.master b/Mst.master
index 69266a0..b139742 100644
--- a/Mst.master
+++ b/Mst.master
@@ -11,11 +11,7 @@
<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
+ <script src="/scripts/config.js?<%=1234 %>"></script>
<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