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

1

Browse Source
This commit is contained in:
夏菊
2025-02-22 10:34:16 +08:00
parent 0c6a49306c 7396d1b654
commit 379ff372c5
63 changed files with 4416 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+37 -1
View File
@@ -2200,9 +2200,18 @@
<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" />
@@ -15082,6 +15091,23 @@
<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>
</Compile>
<Compile Include="HSSE\PostTraining\Record.aspx.designer.cs">
<DependentUpon>Record.aspx</DependentUpon>
</Compile>
<Compile Include="HSSE\PostTraining\SelectPerson.aspx.cs">
<DependentUpon>SelectPerson.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<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>
@@ -15103,6 +15129,16 @@
<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>
</Compile>
<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>
@@ -19687,7 +19723,7 @@
<WCFMetadata Include="Service References\" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">