Merge branch 'master' of http://47.104.102.122:3000/lpf/SGGL_SHJ
This commit is contained in:
@@ -1637,6 +1637,7 @@
|
||||
<Content Include="HJGL\PreDesign\PackagingManageSelectStock.aspx" />
|
||||
<Content Include="HJGL\PreDesign\PackagingManageView.aspx" />
|
||||
<Content Include="HJGL\PreDesign\InstallList.aspx" />
|
||||
<Content Include="HJGL\PreDesign\PrePipelineComponentJointIn.aspx" />
|
||||
<Content Include="HJGL\PreDesign\PrePipelineQRCodeIn.aspx" />
|
||||
<Content Include="HJGL\PreDesign\ProductionSchedulingPlan.aspx" />
|
||||
<Content Include="HJGL\PreDesign\TrainNumberManager.aspx" />
|
||||
@@ -10975,6 +10976,13 @@
|
||||
<Compile Include="HJGL\PreDesign\PrePipelineQRCodeIn.aspx.designer.cs">
|
||||
<DependentUpon>PrePipelineQRCodeIn.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="HJGL\PreDesign\PrePipelineComponentJointIn.aspx.cs">
|
||||
<DependentUpon>PrePipelineComponentJointIn.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="HJGL\PreDesign\PrePipelineComponentJointIn.aspx.designer.cs">
|
||||
<DependentUpon>PrePipelineComponentJointIn.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="HJGL\PreDesign\ProductionSchedulingPlan.aspx.cs">
|
||||
<DependentUpon>ProductionSchedulingPlan.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
|
||||
Reference in New Issue
Block a user