Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN
This commit is contained in:
@@ -622,6 +622,9 @@
|
||||
<Content Include="DataShow\LargeEngineeringItem.aspx" />
|
||||
<Content Include="DataShow\License.aspx" />
|
||||
<Content Include="DataShow\Meeting.aspx" />
|
||||
<Content Include="DataShow\Person1.aspx" />
|
||||
<Content Include="DataShow\Person2.aspx" />
|
||||
<Content Include="DataShow\Person3.aspx" />
|
||||
<Content Include="DataShow\Project.aspx" />
|
||||
<Content Include="DataShow\ProjectDivision.aspx" />
|
||||
<Content Include="DataShow\ProjectPerson.aspx" />
|
||||
@@ -635,6 +638,7 @@
|
||||
<Content Include="DataShow\QualityTraining.aspx" />
|
||||
<Content Include="DataShow\QualityTrainingItem1.aspx" />
|
||||
<Content Include="DataShow\QualityTrainingItem2.aspx" />
|
||||
<Content Include="DataShow\SafePerson.aspx" />
|
||||
<Content Include="DataShow\SecurityCost.aspx" />
|
||||
<Content Include="DataShow\SecurityRisk.aspx" />
|
||||
<Content Include="DataShow\SecurityRiskItem.aspx" />
|
||||
@@ -8743,6 +8747,27 @@
|
||||
<Compile Include="DataShow\Meeting.aspx.designer.cs">
|
||||
<DependentUpon>Meeting.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="DataShow\Person1.aspx.cs">
|
||||
<DependentUpon>Person1.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="DataShow\Person1.aspx.designer.cs">
|
||||
<DependentUpon>Person1.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="DataShow\Person2.aspx.cs">
|
||||
<DependentUpon>Person2.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="DataShow\Person2.aspx.designer.cs">
|
||||
<DependentUpon>Person2.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="DataShow\Person3.aspx.cs">
|
||||
<DependentUpon>Person3.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="DataShow\Person3.aspx.designer.cs">
|
||||
<DependentUpon>Person3.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="DataShow\Project.aspx.cs">
|
||||
<DependentUpon>Project.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
@@ -8834,6 +8859,13 @@
|
||||
<Compile Include="DataShow\QualityTrainingItem2.aspx.designer.cs">
|
||||
<DependentUpon>QualityTrainingItem2.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="DataShow\SafePerson.aspx.cs">
|
||||
<DependentUpon>SafePerson.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="DataShow\SafePerson.aspx.designer.cs">
|
||||
<DependentUpon>SafePerson.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="DataShow\SecurityCost.aspx.cs">
|
||||
<DependentUpon>SecurityCost.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
|
||||
Reference in New Issue
Block a user