From 286c3de26f485a84f5907f1e4e615b8c5e922395 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 01 八月 2024 17:08:31 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/Properties/PublishProfiles/JFTM.pubxml.user |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 2d648c3..4c894a1 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -62,6 +62,9 @@
     <File Include="layuiadmin/HideButton.js">
       <publishTime>09/25/2023 09:17:10</publishTime>
     </File>
+    <File Include="layuiadmin/img/img_little_new.png">
+      <publishTime>07/31/2024 08:38:47</publishTime>
+    </File>
     <File Include="layuiadmin/json/console/prograss.js">
       <publishTime>09/05/2022 13:34:25</publishTime>
     </File>
@@ -2015,6 +2018,18 @@
     <File Include="views/WMS鎵爜妯″潡/鎵爜楠岃瘉/Gy_BarCodeConfirmBill_PDA.html">
       <publishTime>07/17/2024 11:35:08</publishTime>
     </File>
+    <File Include="views/WMS鎵爜妯″潡/鎵爜楠岃瘉/Gy_BarCodeConfirmBillList.html">
+      <publishTime>07/12/2024 14:03:59</publishTime>
+    </File>
+    <File Include="views/WMS鎵爜妯″潡/鎵爜楠岃瘉/Gy_BarCodeConfirmBillList_BarCodeList.html">
+      <publishTime>07/12/2024 14:56:01</publishTime>
+    </File>
+    <File Include="views/WMS鎵爜妯″潡/鎵爜楠岃瘉/Gy_BarCodeConfirmBillList_PDA.html">
+      <publishTime>07/25/2024 11:21:38</publishTime>
+    </File>
+    <File Include="views/WMS鎵爜妯″潡/鎵爜楠岃瘉/Gy_BarCodeConfirmBill_PDA.html">
+      <publishTime>07/29/2024 15:15:30</publishTime>
+    </File>
     <File Include="views/WMS鎵爜妯″潡/鏉$爜鍑哄叆搴撴煡璇�/Gy_BarCodeBillInOut__PDA.html">
       <publishTime>02/28/2024 14:07:44</publishTime>
     </File>
@@ -2752,6 +2767,9 @@
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_UnitConvertRateList.html">
       <publishTime>07/17/2024 11:35:08</publishTime>
+    </File>
+    <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_UnitConvertRateList.html">
+      <publishTime>07/15/2024 09:58:59</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html">
       <publishTime>07/17/2024 11:35:08</publishTime>
@@ -4838,6 +4856,12 @@
     <File Include="views/鐢熶骇绠$悊/榻愬鍒嗘瀽/JIT_CompleteMaterlDetailList.html">
       <publishTime>03/07/2024 10:25:25</publishTime>
     </File>
+    <File Include="views/鐪嬫澘/閲囪喘鏀舵枡/KB_CGSL.html">
+      <publishTime>07/31/2024 13:11:01</publishTime>
+    </File>
+    <File Include="views/鐪嬫澘/閲囪喘鏀舵枡/KB_CGSL_New.html">
+      <publishTime>07/31/2024 13:36:13</publishTime>
+    </File>
     <File Include="views/绯荤粺绠$悊/浼氳鏈熼棿/Xt_AccountPeriodAdd.html">
       <publishTime>06/14/2024 13:06:23</publishTime>
     </File>

--
Gitblit v1.9.1