Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN
This commit is contained in:
@@ -1454,11 +1454,15 @@
|
||||
<Content Include="Party\TwoOneGoodSelectionEdit.aspx" />
|
||||
<Content Include="Party\WorkPlan.aspx" />
|
||||
<Content Include="Party\WorkPlanEdit.aspx" />
|
||||
<Content Include="Personal\BusinessTrip.aspx" />
|
||||
<Content Include="Personal\BusinessTripEdit.aspx" />
|
||||
<Content Include="Personal\PersonMeeting.aspx" />
|
||||
<Content Include="Personal\PersonMeetingEdit.aspx" />
|
||||
<Content Include="Personal\FileSearch.aspx" />
|
||||
<Content Include="Personal\PersonCheckInfo.aspx" />
|
||||
<Content Include="Personal\PersonDuty.aspx" />
|
||||
<Content Include="Personal\TestRunPerformance.aspx" />
|
||||
<Content Include="Personal\TestRunPerformanceEdit.aspx" />
|
||||
<Content Include="Person\PersonCheck.aspx" />
|
||||
<Content Include="Person\PersonChecking.aspx" />
|
||||
<Content Include="Person\PersonCheckingView.aspx" />
|
||||
@@ -2053,6 +2057,8 @@
|
||||
<Content Include="ZHGL\Supervise\SuperviseCheckReport.aspx" />
|
||||
<Content Include="ZHGL\Supervise\SuperviseCheckReportEdit.aspx" />
|
||||
<Content Include="common\font\DIN-Medium.otf" />
|
||||
<Content Include="ZHGL\TestRunPerformance\TestRunPerformanceMonthReport.aspx" />
|
||||
<Content Include="ZHGL\TestRunPerformance\TestRunPerformanceMonthReportEdit.aspx" />
|
||||
<Content Include="ZHGL\TestRunPerformance\TestRunPerformanceStandard.aspx" />
|
||||
<Content Include="ZHGL\TestRunPerformance\TestRunPerformanceStandardEdit.aspx" />
|
||||
<None Include="Doc\help1.doc" />
|
||||
@@ -14187,6 +14193,20 @@
|
||||
<Compile Include="Party\WorkPlanEdit.aspx.designer.cs">
|
||||
<DependentUpon>WorkPlanEdit.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Personal\BusinessTrip.aspx.cs">
|
||||
<DependentUpon>BusinessTrip.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Personal\BusinessTrip.aspx.designer.cs">
|
||||
<DependentUpon>BusinessTrip.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Personal\BusinessTripEdit.aspx.cs">
|
||||
<DependentUpon>BusinessTripEdit.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Personal\BusinessTripEdit.aspx.designer.cs">
|
||||
<DependentUpon>BusinessTripEdit.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Personal\PersonMeeting.aspx.cs">
|
||||
<DependentUpon>PersonMeeting.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
@@ -14222,6 +14242,20 @@
|
||||
<Compile Include="Personal\PersonDuty.aspx.designer.cs">
|
||||
<DependentUpon>PersonDuty.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Personal\TestRunPerformance.aspx.cs">
|
||||
<DependentUpon>TestRunPerformance.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Personal\TestRunPerformance.aspx.designer.cs">
|
||||
<DependentUpon>TestRunPerformance.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Personal\TestRunPerformanceEdit.aspx.cs">
|
||||
<DependentUpon>TestRunPerformanceEdit.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Personal\TestRunPerformanceEdit.aspx.designer.cs">
|
||||
<DependentUpon>TestRunPerformanceEdit.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Person\PersonCheck.aspx.cs">
|
||||
<DependentUpon>PersonCheck.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
@@ -17939,6 +17973,20 @@
|
||||
<Compile Include="ZHGL\Supervise\SuperviseCheckReportEdit.aspx.designer.cs">
|
||||
<DependentUpon>SuperviseCheckReportEdit.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\TestRunPerformance\TestRunPerformanceMonthReport.aspx.cs">
|
||||
<DependentUpon>TestRunPerformanceMonthReport.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\TestRunPerformance\TestRunPerformanceMonthReport.aspx.designer.cs">
|
||||
<DependentUpon>TestRunPerformanceMonthReport.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\TestRunPerformance\TestRunPerformanceMonthReportEdit.aspx.cs">
|
||||
<DependentUpon>TestRunPerformanceMonthReportEdit.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\TestRunPerformance\TestRunPerformanceMonthReportEdit.aspx.designer.cs">
|
||||
<DependentUpon>TestRunPerformanceMonthReportEdit.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\TestRunPerformance\TestRunPerformanceStandard.aspx.cs">
|
||||
<DependentUpon>TestRunPerformanceStandard.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
|
||||
Reference in New Issue
Block a user