Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN
This commit is contained in:
@@ -1780,12 +1780,16 @@
|
||||
<Content Include="TestRun\DriverSummary\MonthSummaryEdit.aspx" />
|
||||
<Content Include="TestRun\FeedingTestRun.aspx" />
|
||||
<Content Include="TestRun\FeedingTestRunEdit.aspx" />
|
||||
<Content Include="TestRun\Meeting\Feedback.aspx" />
|
||||
<Content Include="TestRun\Meeting\ScheduleMeeting.aspx" />
|
||||
<Content Include="TestRun\Meeting\ScheduleMeetingEdit.aspx" />
|
||||
<Content Include="TestRun\Meeting\ScheduleMeetingView.aspx" />
|
||||
<Content Include="TestRun\Meeting\SpecialMeeting.aspx" />
|
||||
<Content Include="TestRun\Meeting\SpecialMeetingEdit.aspx" />
|
||||
<Content Include="TestRun\Meeting\SpecialMeetingView.aspx" />
|
||||
<Content Include="TestRun\Meeting\WeekMeeting.aspx" />
|
||||
<Content Include="TestRun\Meeting\WeekMeetingEdit.aspx" />
|
||||
<Content Include="TestRun\Meeting\WeekMeetingView.aspx" />
|
||||
<Content Include="TestRun\PersonTrain\PersonTrainPlan.aspx" />
|
||||
<Content Include="TestRun\PersonTrain\PersonTrainPlanEdit.aspx" />
|
||||
<Content Include="TestRun\PersonTrain\TrainContact.aspx" />
|
||||
@@ -16019,6 +16023,13 @@
|
||||
<Compile Include="TestRun\FeedingTestRunEdit.aspx.designer.cs">
|
||||
<DependentUpon>FeedingTestRunEdit.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="TestRun\Meeting\Feedback.aspx.cs">
|
||||
<DependentUpon>Feedback.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="TestRun\Meeting\Feedback.aspx.designer.cs">
|
||||
<DependentUpon>Feedback.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="TestRun\Meeting\ScheduleMeeting.aspx.cs">
|
||||
<DependentUpon>ScheduleMeeting.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
@@ -16033,6 +16044,13 @@
|
||||
<Compile Include="TestRun\Meeting\ScheduleMeetingEdit.aspx.designer.cs">
|
||||
<DependentUpon>ScheduleMeetingEdit.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="TestRun\Meeting\ScheduleMeetingView.aspx.cs">
|
||||
<DependentUpon>ScheduleMeetingView.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="TestRun\Meeting\ScheduleMeetingView.aspx.designer.cs">
|
||||
<DependentUpon>ScheduleMeetingView.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="TestRun\Meeting\SpecialMeeting.aspx.cs">
|
||||
<DependentUpon>SpecialMeeting.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
@@ -16047,6 +16065,13 @@
|
||||
<Compile Include="TestRun\Meeting\SpecialMeetingEdit.aspx.designer.cs">
|
||||
<DependentUpon>SpecialMeetingEdit.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="TestRun\Meeting\SpecialMeetingView.aspx.cs">
|
||||
<DependentUpon>SpecialMeetingView.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="TestRun\Meeting\SpecialMeetingView.aspx.designer.cs">
|
||||
<DependentUpon>SpecialMeetingView.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="TestRun\Meeting\WeekMeeting.aspx.cs">
|
||||
<DependentUpon>WeekMeeting.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
@@ -16061,6 +16086,13 @@
|
||||
<Compile Include="TestRun\Meeting\WeekMeetingEdit.aspx.designer.cs">
|
||||
<DependentUpon>WeekMeetingEdit.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="TestRun\Meeting\WeekMeetingView.aspx.cs">
|
||||
<DependentUpon>WeekMeetingView.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="TestRun\Meeting\WeekMeetingView.aspx.designer.cs">
|
||||
<DependentUpon>WeekMeetingView.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="TestRun\PersonTrain\PersonTrainPlan.aspx.cs">
|
||||
<DependentUpon>PersonTrainPlan.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
|
||||
Reference in New Issue
Block a user