lpf/xinjiang
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

培训

Browse Source
This commit is contained in:
夏菊
2025-02-25 16:46:09 +08:00
parent 9a1dae2f31
commit 1c5146a776
40 changed files with 1 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+1 -13
View File
@@ -2203,18 +2203,12 @@
<Content Include="HSSE\Perfomance\PersonPerfomance.aspx" />
<Content Include="HSSE\Perfomance\PersonPerfomanceEdit.aspx" />
<Content Include="HSSE\Perfomance\PersonPerfomanceView.aspx" />
<<<<<<< HEAD
<Content Include="HSSE\PostTraining\Standard.aspx" />
<Content Include="HSSE\PostTraining\StandardDataIn.aspx" />
<Content Include="HSSE\PostTraining\CourseDataIn.aspx" />
=======
<Content Include="HSSE\PostTraining\Record.aspx" />
<Content Include="HSSE\PostTraining\SelectPerson.aspx" />
<Content Include="HSSE\PostTraining\Standard.aspx" />
<Content Include="HSSE\PostTraining\StandardDataIn.aspx" />
<Content Include="HSSE\PostTraining\CourseDataIn.aspx" />
<Content Include="HSSE\PostTraining\RecordEdit.aspx" />
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
<Content Include="HSSE\PostTraining\StandardEdit.aspx" />
<Content Include="HSSE\PostTraining\Teachers.aspx" />
<Content Include="HSSE\PostTraining\TeachersEdit.aspx" />
@@ -15161,8 +15155,6 @@
<Compile Include="HSSE\Perfomance\PersonPerfomanceView.aspx.designer.cs">
<DependentUpon>PersonPerfomanceView.aspx</DependentUpon>
</Compile>
<<<<<<< HEAD
=======
<Compile Include="HSSE\PostTraining\Record.aspx.cs">
<DependentUpon>Record.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -15177,7 +15169,6 @@
<Compile Include="HSSE\PostTraining\SelectPerson.aspx.designer.cs">
<DependentUpon>SelectPerson.aspx</DependentUpon>
</Compile>
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
<Compile Include="HSSE\PostTraining\Standard.aspx.cs">
<DependentUpon>Standard.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -15199,8 +15190,6 @@
<Compile Include="HSSE\PostTraining\CourseDataIn.aspx.designer.cs">
<DependentUpon>CourseDataIn.aspx</DependentUpon>
</Compile>
<<<<<<< HEAD
=======
<Compile Include="HSSE\PostTraining\RecordEdit.aspx.cs">
<DependentUpon>RecordEdit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -15208,7 +15197,6 @@
<Compile Include="HSSE\PostTraining\RecordEdit.aspx.designer.cs">
<DependentUpon>RecordEdit.aspx</DependentUpon>
</Compile>
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
<Compile Include="HSSE\PostTraining\StandardEdit.aspx.cs">
<DependentUpon>StandardEdit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -20115,7 +20103,7 @@
<WCFMetadata Include="Service References\" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.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}">