From 54ddbb9eba145dfdcee0c3d28bdd1a91aec34122 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 31 一月 2024 15:50:37 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

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

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index e68f2ed..88b887c 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -307,6 +307,7 @@
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_TemporaryArea.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\HBarPlanPrint_GXPG.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_MyTicke.aspx" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlPM_WorkTaskBillMyList.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlPM_ProjectBillMainMy.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_SellOutBillList.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_SellOutBillList_BarCodeNote.aspx" />
@@ -672,6 +673,7 @@
     <Content Include="views\grf\閫�鏂欓�氱煡鍗�.grf" />
     <Content Include="views\grf\鎴戠殑椤圭洰.grf" />
     <Content Include="views\grf\鎴戠殑宸ュ崟.grf" />
+    <Content Include="views\grf\鎴戠殑浠诲姟.grf" />
     <None Include="Web.Debug.config">
       <DependentUpon>Web.config</DependentUpon>
     </None>
@@ -1578,6 +1580,7 @@
     <Content Include="views\椤圭洰绠$悊\宸ヤ綔浠诲姟\PM_WorkTaskReportBill.html" />
     <Content Include="views\椤圭洰绠$悊\宸ヤ綔浠诲姟\PM_WorkTaskBillList.html" />
     <Content Include="views\椤圭洰绠$悊\宸ヤ綔浠诲姟\PM_WorkTaskBill.html" />
+    <Content Include="views\椤圭洰绠$悊\宸ヤ綔浠诲姟\PM_WorkTaskBillMainMy.html" />
     <Content Include="views\椤圭洰绠$悊\宸ョ▼椤圭洰\PM_ProjectBill.html" />
     <Content Include="views\椤圭洰绠$悊\宸ョ▼椤圭洰\PM_ProjectBillList.html" />
     <Content Include="views\椤圭洰绠$悊\宸ョ▼椤圭洰\PM_WorkPlanMonthBillMain.html" />
@@ -1760,6 +1763,13 @@
     <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_MyTicke.aspx.designer.cs">
       <DependentUpon>xmlLBM_Sc_MyTicke.aspx</DependentUpon>
     </Compile>
+    <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlPM_WorkTaskBillMyList.aspx.cs">
+      <DependentUpon>xmlPM_WorkTaskBillMyList.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlPM_WorkTaskBillMyList.aspx.designer.cs">
+      <DependentUpon>xmlPM_WorkTaskBillMyList.aspx</DependentUpon>
+    </Compile>
     <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlPM_ProjectBillMainMy.aspx.cs">
       <DependentUpon>xmlPM_ProjectBillMainMy.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>

--
Gitblit v1.9.1