MES-WEB-LayUI.git

			@@ -472,7 +472,6 @@
			<Content Include="views\基础资料\公用基础资料\Gy_MaterialPackingRelation_Edit.html" />
			<Content Include="views\基础资料\公用基础资料\Gy_ItemMoney.html" />
			<Content Include="views\基础资料\公用基础资料\Cg_ContractTransportBillList.html" />
			<Content Include="views\基础资料\公用基础资料\xmlLBM_xiaoweizutuo.aspx" />
			<Content Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx" />
			<Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeBillList_stock.aspx" />
			<Content Include="views\基础资料\公用基础资料\xmlzuotuo_xiaowei.aspx" />
			@@ -2700,13 +2699,6 @@
			<Compile Include="App_Data\MssqlReportData.cs" />
			<Compile Include="App_Data\ReportData.cs" />
			<Compile Include="Properties\AssemblyInfo.cs" />
			<Compile Include="views\基础资料\公用基础资料\xmlLBM_xiaoweizutuo.aspx.cs">
			<DependentUpon>xmlLBM_xiaoweizutuo.aspx</DependentUpon>
			<SubType>ASPXCodeBehind</SubType>
			</Compile>
			<Compile Include="views\基础资料\公用基础资料\xmlLBM_xiaoweizutuo.aspx.designer.cs">
			<DependentUpon>xmlLBM_xiaoweizutuo.aspx</DependentUpon>
			</Compile>
			<Compile Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx.cs">
			<DependentUpon>xmlLBM_HGy_BarCodeBill_MiddleBox.aspx</DependentUpon>
			<SubType>ASPXCodeBehind</SubType>

			@@ -1,7 +1,6 @@
			<?xml version="1.0" encoding="utf-8"?>
			<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
			<PropertyGroup>
			<<<<<<< HEAD
			<LastActiveSolutionConfig>Release\|Any CPU</LastActiveSolutionConfig>
			<UseIISExpress>true</UseIISExpress>
			<Use64BitIISExpress />
			@@ -10,10 +9,8 @@
			<IISExpressWindowsAuthentication />
			<IISExpressUseClassicPipelineMode />
			<UseGlobalApplicationHostFile />
			<NameOfLastUsedPublishProfile>D:\gz\MES-WEB-TM\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
			=======
			<LastActiveSolutionConfig>Debug\|Any CPU</LastActiveSolutionConfig>
			>>>>>>> 2ed130171719a0848e8356d28055eb1bdf649d01
			<NameOfLastUsedPublishProfile>D:\GitHub\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
			<LastActiveSolutionConfig>Release\|Any CPU</LastActiveSolutionConfig>
			</PropertyGroup>
			<ProjectExtensions>
			<VisualStudio>

	WebTM/WebTM.csproj	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/WebTM.csproj.user	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史