Merge branch 'master' of http://47.104.102.122:3000/lpf/SGGL_SeDin_New
This commit is contained in:
@@ -1556,6 +1556,7 @@
|
||||
<Content Include="HJGL\PreDesign\PackagingManageSelect.aspx" />
|
||||
<Content Include="HJGL\PreDesign\PackagingManageSelectStock.aspx" />
|
||||
<Content Include="HJGL\PreDesign\PackagingManageView.aspx" />
|
||||
<Content Include="HJGL\PreDesign\InstallList.aspx" />
|
||||
<Content Include="HJGL\PreDesign\PrePipelineQRCodeIn.aspx" />
|
||||
<Content Include="HJGL\PreDesign\TrainNumberManager.aspx" />
|
||||
<Content Include="HJGL\PreDesign\TrainNumberManageEdit.aspx" />
|
||||
@@ -10570,6 +10571,13 @@
|
||||
<Compile Include="HJGL\PreDesign\PackagingManageView.aspx.designer.cs">
|
||||
<DependentUpon>PackagingManageView.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="HJGL\PreDesign\InstallList.aspx.cs">
|
||||
<DependentUpon>InstallList.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="HJGL\PreDesign\InstallList.aspx.designer.cs">
|
||||
<DependentUpon>InstallList.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="HJGL\PreDesign\PrePipelineQRCodeIn.aspx.cs">
|
||||
<DependentUpon>PrePipelineQRCodeIn.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
@@ -16567,7 +16575,7 @@
|
||||
</COMReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
|
||||
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
|
||||
<ProjectExtensions>
|
||||
<VisualStudio>
|
||||
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
|
||||
|
||||
Reference in New Issue
Block a user