From 36f03881a44a58c7d02ce2190c9f4f3ea3a8f59e Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期四, 11 九月 2025 16:36:29 +0800
Subject: [PATCH] 调拨入库：该为扫描物料条码后不清空库位，库位只能手动删除
---
Mst.master | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/Mst.master b/Mst.master
index 69266a0..ac8205e 100644
--- a/Mst.master
+++ b/Mst.master
@@ -11,14 +11,10 @@
<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?<%=1236111102 %>"></script>
<link href="/scripts/vant/vant.css" rel="stylesheet" />
<script src="/scripts/vant/vant.js"></script>
- <link href="/Images/Style.css?<%=1 %>" rel="stylesheet" />
+ <link href="/Images/Style.css?<%=1699524 %>" rel="stylesheet" />
<script src="/Scripts/uni.webview.1.5.2.js"></script>
<asp:ContentPlaceHolder ID="head" runat="server">
</asp:ContentPlaceHolder>
--
Gitblit v1.9.3