From 943e21ffe72a21d6c643d9a69846b4e84f2a850d Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 22 四月 2024 17:27:21 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/WebTM.csproj |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 53cf985..f04f17e 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -340,6 +340,8 @@
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_CardAddress.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_CardType.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_FixCard.aspx" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_ICStockBackBillList.aspx" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_SellOutBillList_BarCodeNote_ByCusDefine.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Pay_WorkTimesBillList.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_MyTicke.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Xs_SellOutChangeBillList.aspx" />
@@ -799,6 +801,7 @@
     <Content Include="views\grf\鍏朵粬搴旀敹鍗�.grf" />
     <Content Include="views\grf\閿�鍞皟浠峰崟涓嶅惈绋�.grf" />
     <Content Include="views\grf\閿�鍞皟浠峰崟鍚◣锛堜粎闄愬惈绋庢墦鍗帮級.grf" />
+    <Content Include="views\grf\閿�鍞��璐у崟娴嬭瘯1.grf" />
     <None Include="Web.Debug.config">
       <DependentUpon>Web.config</DependentUpon>
     </None>
@@ -1947,6 +1950,20 @@
     <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_FixCard.aspx.designer.cs">
       <DependentUpon>xmlLBM_HGy_FixCard.aspx</DependentUpon>
     </Compile>
+    <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_ICStockBackBillList.aspx.cs">
+      <DependentUpon>xmlLBM_Kf_ICStockBackBillList.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_ICStockBackBillList.aspx.designer.cs">
+      <DependentUpon>xmlLBM_Kf_ICStockBackBillList.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_SellOutBillList_BarCodeNote_ByCusDefine.aspx.cs">
+      <DependentUpon>xmlLBM_Kf_SellOutBillList_BarCodeNote_ByCusDefine.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_SellOutBillList_BarCodeNote_ByCusDefine.aspx.designer.cs">
+      <DependentUpon>xmlLBM_Kf_SellOutBillList_BarCodeNote_ByCusDefine.aspx</DependentUpon>
+    </Compile>
     <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Pay_WorkTimesBillList.aspx.cs">
       <DependentUpon>xmlLBM_Pay_WorkTimesBillList.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>

--
Gitblit v1.9.1