From 8160f59f250ab89b2793eda0b44e358153644393 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期四, 11 十一月 2021 11:03:55 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/SRM-LAYUI
---
WebSRM/WebSRM.csproj | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/WebSRM/WebSRM.csproj b/WebSRM/WebSRM.csproj
index 5425b90..5e18b5d 100644
--- a/WebSRM/WebSRM.csproj
+++ b/WebSRM/WebSRM.csproj
@@ -868,6 +868,7 @@
<Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_POOrderBillList.html" />
<Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_BarCodeBill.html" />
<Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_BarCodeBillList.html" />
+ <Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\xmlSRM_Web_PoBarCodeBillList.aspx" />
<Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\xmlSRM_Web_BarCodeBillList.aspx" />
<Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\xmlSRM_POInStockBill.aspx" />
<Content Include="layuiAdmin.std-v1.2.1\src\views\system\about.html" />
@@ -912,6 +913,7 @@
<Content Include="layuiAdmin.std-v1.2.1\src\views\grf\鐗╂枡鏉＄爜.grf" />
<Content Include="layuiAdmin.std-v1.2.1\src\views\grf\閫佽揣鍗�.grf" />
<Content Include="layuiAdmin.std-v1.2.1\src\views\grf\閫佽揣鍗�%28鏍囩绾�%29.grf" />
+ <Content Include="layuiAdmin.std-v1.2.1\src\views\grf\渚涘簲鍟嗗崗鍚岄噰璐鍗�.grf" />
<None Include="Properties\PublishProfiles\websrm.pubxml" />
<None Include="Scripts\jquery-1.8.2.intellisense.js" />
<Content Include="Scripts\jquery-1.8.2.js" />
@@ -1003,6 +1005,13 @@
<Compile Include="Global.asax.cs">
<DependentUpon>Global.asax</DependentUpon>
</Compile>
+ <Compile Include="layuiAdmin.std-v1.2.1\src\views\SRM\xmlSRM_Web_PoBarCodeBillList.aspx.cs">
+ <DependentUpon>xmlSRM_Web_PoBarCodeBillList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="layuiAdmin.std-v1.2.1\src\views\SRM\xmlSRM_Web_PoBarCodeBillList.aspx.designer.cs">
+ <DependentUpon>xmlSRM_Web_PoBarCodeBillList.aspx</DependentUpon>
+ </Compile>
<Compile Include="layuiAdmin.std-v1.2.1\src\views\SRM\xmlSRM_Web_BarCodeBillList.aspx.cs">
<DependentUpon>xmlSRM_Web_BarCodeBillList.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
--
Gitblit v1.9.1