diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj
index 7a5665d..2dfb61b 100644
--- a/SGGL/BLL/BLL.csproj
+++ b/SGGL/BLL/BLL.csproj
@@ -690,8 +690,11 @@
     <Compile Include="HSSE\OccupationHealth\PhysicalExaminationService.cs" />
     <Compile Include="HSSE\Perfomance\PerfomanceRecordService.cs" />
     <Compile Include="HSSE\Perfomance\PersonPerfomanceService.cs" />
+<<<<<<< HEAD
+=======
     <Compile Include="HSSE\PostTraining\PostTrainingRecordDetailService.cs" />
     <Compile Include="HSSE\PostTraining\PostTrainingRecordService.cs" />
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
     <Compile Include="HSSE\PostTraining\PostTrainingStandardService.cs" />
     <Compile Include="HSSE\PostTraining\PostTrainingMethodService.cs" />
     <Compile Include="HSSE\PostTraining\PostTrainingTeachersService.cs" />
diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs
index e3b524e..031b787 100644
--- a/SGGL/BLL/Common/Const.cs
+++ b/SGGL/BLL/Common/Const.cs
@@ -1729,11 +1729,14 @@ namespace BLL
         #region 岗位培训
 
         /// <summary>
+<<<<<<< HEAD
+=======
         /// 岗位培训记录
         /// </summary>
         public const string PostTrainingRecordMenuId = "CEF2A108-DDC2-46A2-A47B-7431F1F890F1";
 
         /// <summary>
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
         /// 岗位培训类别
         /// </summary>
         public const string PostTrainingCategoryMenuId = "465786B2-AD20-483A-A082-B2C944BE998F";
diff --git a/SGGL/BLL/HSSE/PostTraining/PostTrainingCategoryService.cs b/SGGL/BLL/HSSE/PostTraining/PostTrainingCategoryService.cs
index dd87512..116ea93 100644
--- a/SGGL/BLL/HSSE/PostTraining/PostTrainingCategoryService.cs
+++ b/SGGL/BLL/HSSE/PostTraining/PostTrainingCategoryService.cs
@@ -60,8 +60,11 @@ namespace BLL
                 newModel.Code = model.Code;
                 newModel.Name = model.Name;
                 newModel.Remark = model.Remark;
+<<<<<<< HEAD
+=======
                 newModel.CompileDate = model.CompileDate;
                 newModel.CompileMan = model.CompileMan;
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
                 Funs.DB.SubmitChanges();
             }
         }
diff --git a/SGGL/BLL/HSSE/PostTraining/PostTrainingCourseService.cs b/SGGL/BLL/HSSE/PostTraining/PostTrainingCourseService.cs
index 7977266..5a2ce55 100644
--- a/SGGL/BLL/HSSE/PostTraining/PostTrainingCourseService.cs
+++ b/SGGL/BLL/HSSE/PostTraining/PostTrainingCourseService.cs
@@ -1,8 +1,19 @@
+<<<<<<< HEAD
+using EmitMapper;
+using Microsoft.Office.Interop.Word;
+using MiniExcelLibs;
+=======
 using MiniExcelLibs;
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 using Model;
 using System.Collections.Generic;
 using System;
 using System.Linq;
+<<<<<<< HEAD
+using System.Runtime.CompilerServices;
+using Quartz.Util;
+=======
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace BLL
 {
@@ -64,8 +75,11 @@ namespace BLL
                 newModel.Teachers1 = model.Teachers1;
                 newModel.Teachers2 = model.Teachers2;
                 newModel.Remark = model.Remark;
+<<<<<<< HEAD
+=======
                 newModel.CompileDate = model.CompileDate;
                 newModel.CompileMan = model.CompileMan;
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
                 Funs.DB.SubmitChanges();
             }
         }
diff --git a/SGGL/BLL/HSSE/PostTraining/PostTrainingMethodService.cs b/SGGL/BLL/HSSE/PostTraining/PostTrainingMethodService.cs
index 1a65a6e..c1cc39c 100644
--- a/SGGL/BLL/HSSE/PostTraining/PostTrainingMethodService.cs
+++ b/SGGL/BLL/HSSE/PostTraining/PostTrainingMethodService.cs
@@ -60,8 +60,11 @@ namespace BLL
                 newModel.Code = model.Code;
                 newModel.Name = model.Name;
                 newModel.Remark = model.Remark;
+<<<<<<< HEAD
+=======
                 newModel.CompileDate = model.CompileDate;
                 newModel.CompileMan = model.CompileMan;
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
                 Funs.DB.SubmitChanges();
             }
         }
diff --git a/SGGL/BLL/HSSE/PostTraining/PostTrainingRoleService.cs b/SGGL/BLL/HSSE/PostTraining/PostTrainingRoleService.cs
index 58851f5..be50fec 100644
--- a/SGGL/BLL/HSSE/PostTraining/PostTrainingRoleService.cs
+++ b/SGGL/BLL/HSSE/PostTraining/PostTrainingRoleService.cs
@@ -50,8 +50,11 @@ namespace BLL
                 newModel.Code = model.Code;
                 newModel.Name = model.Name;
                 newModel.Remark = model.Remark;
+<<<<<<< HEAD
+=======
                 newModel.CompileDate = model.CompileDate;
                 newModel.CompileMan = model.CompileMan;
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
                 Funs.DB.SubmitChanges();
             }
         }
diff --git a/SGGL/BLL/HSSE/PostTraining/PostTrainingStandardService.cs b/SGGL/BLL/HSSE/PostTraining/PostTrainingStandardService.cs
index c87130c..5c258db 100644
--- a/SGGL/BLL/HSSE/PostTraining/PostTrainingStandardService.cs
+++ b/SGGL/BLL/HSSE/PostTraining/PostTrainingStandardService.cs
@@ -1,9 +1,24 @@
+<<<<<<< HEAD
+using EmitMapper;
+using Microsoft.Office.Interop.Word;
+using MiniExcelLibs;
+=======
 using MiniExcelLibs;
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 using Model;
 using System.Collections.Generic;
 using System;
 using System.Linq;
+<<<<<<< HEAD
+using System.Runtime.CompilerServices;
+using Quartz.Util;
+using Microsoft.Office.Interop.Excel;
+using RestSharp;
 using System.Web.UI.WebControls;
+using Microsoft.SqlServer.Dts.Runtime;
+=======
+using System.Web.UI.WebControls;
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace BLL
 {
diff --git a/SGGL/BLL/HSSE/PostTraining/PostTrainingTeachersService.cs b/SGGL/BLL/HSSE/PostTraining/PostTrainingTeachersService.cs
index 01d4aa9..f970a60 100644
--- a/SGGL/BLL/HSSE/PostTraining/PostTrainingTeachersService.cs
+++ b/SGGL/BLL/HSSE/PostTraining/PostTrainingTeachersService.cs
@@ -60,8 +60,11 @@ namespace BLL
                 newModel.Code = model.Code;
                 newModel.Name = model.Name;
                 newModel.Remark = model.Remark;
+<<<<<<< HEAD
+=======
                 newModel.CompileDate = model.CompileDate;
                 newModel.CompileMan = model.CompileMan;
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
                 Funs.DB.SubmitChanges();
             }
         }
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 203c1ca..0a4e36a 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -2203,12 +2203,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" />
@@ -15155,6 +15161,8 @@
     <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>
@@ -15169,6 +15177,7 @@
     <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>
@@ -15190,6 +15199,8 @@
     <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>
@@ -15197,6 +15208,7 @@
     <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>
@@ -20103,7 +20115,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}">
diff --git a/SGGL/FineUIPro.Web/HSSE/Examine/BehavioralSafetyObservation.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Examine/BehavioralSafetyObservation.aspx.cs
index 76c54c6..2406847 100644
--- a/SGGL/FineUIPro.Web/HSSE/Examine/BehavioralSafetyObservation.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Examine/BehavioralSafetyObservation.aspx.cs
@@ -1,8 +1,19 @@
 using System;
+<<<<<<< HEAD
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Xml.Linq;
+using BLL;
+using static System.Runtime.CompilerServices.RuntimeHelpers;
+=======
 using System.Data;
 using System.Linq;
 using System.Text;
 using BLL;
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 using AspNet = System.Web.UI.WebControls;
 
 namespace FineUIPro.Web.HSSE.Examine
diff --git a/SGGL/FineUIPro.Web/HSSE/Examine/BehavioralSafetyObservationEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Examine/BehavioralSafetyObservationEdit.aspx.cs
index e70d554..818efc4 100644
--- a/SGGL/FineUIPro.Web/HSSE/Examine/BehavioralSafetyObservationEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Examine/BehavioralSafetyObservationEdit.aspx.cs
@@ -1,5 +1,9 @@
 using BLL;
 using System;
+<<<<<<< HEAD
+using System.Web;
+=======
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.Examine
 {
diff --git a/SGGL/FineUIPro.Web/HSSE/Examine/BonusScoreSituation.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Examine/BonusScoreSituation.aspx.cs
index f90159f..3a50fdc 100644
--- a/SGGL/FineUIPro.Web/HSSE/Examine/BonusScoreSituation.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Examine/BonusScoreSituation.aspx.cs
@@ -1,8 +1,19 @@
 using System;
+<<<<<<< HEAD
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Xml.Linq;
+using BLL;
+using static System.Runtime.CompilerServices.RuntimeHelpers;
+=======
 using System.Data;
 using System.Linq;
 using System.Text;
 using BLL;
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 using AspNet = System.Web.UI.WebControls;
 
 namespace FineUIPro.Web.HSSE.Examine
diff --git a/SGGL/FineUIPro.Web/HSSE/Examine/BonusScoreSituationEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Examine/BonusScoreSituationEdit.aspx.cs
index 454e6d6..654682e 100644
--- a/SGGL/FineUIPro.Web/HSSE/Examine/BonusScoreSituationEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Examine/BonusScoreSituationEdit.aspx.cs
@@ -1,5 +1,9 @@
 using BLL;
 using System;
+<<<<<<< HEAD
+using System.Web;
+=======
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.Examine
 {
diff --git a/SGGL/FineUIPro.Web/HSSE/Examine/CoConstructionActivities.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Examine/CoConstructionActivities.aspx.cs
index 62efd21..c9e65b8 100644
--- a/SGGL/FineUIPro.Web/HSSE/Examine/CoConstructionActivities.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Examine/CoConstructionActivities.aspx.cs
@@ -1,8 +1,19 @@
 using System;
+<<<<<<< HEAD
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Xml.Linq;
+using BLL;
+using static System.Runtime.CompilerServices.RuntimeHelpers;
+=======
 using System.Data;
 using System.Linq;
 using System.Text;
 using BLL;
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 using AspNet = System.Web.UI.WebControls;
 
 namespace FineUIPro.Web.HSSE.Examine
diff --git a/SGGL/FineUIPro.Web/HSSE/Examine/CoConstructionActivitiesEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Examine/CoConstructionActivitiesEdit.aspx.cs
index 6e85699..bc5fea9 100644
--- a/SGGL/FineUIPro.Web/HSSE/Examine/CoConstructionActivitiesEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Examine/CoConstructionActivitiesEdit.aspx.cs
@@ -1,5 +1,9 @@
 using BLL;
 using System;
+<<<<<<< HEAD
+using System.Web;
+=======
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.Examine
 {
diff --git a/SGGL/FineUIPro.Web/HSSE/Examine/LeadershipJoinHomeworkAnalysisMeeting.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Examine/LeadershipJoinHomeworkAnalysisMeeting.aspx.cs
index 01a5534..cb110a8 100644
--- a/SGGL/FineUIPro.Web/HSSE/Examine/LeadershipJoinHomeworkAnalysisMeeting.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Examine/LeadershipJoinHomeworkAnalysisMeeting.aspx.cs
@@ -1,8 +1,19 @@
 using System;
+<<<<<<< HEAD
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Xml.Linq;
+using BLL;
+using static System.Runtime.CompilerServices.RuntimeHelpers;
+=======
 using System.Data;
 using System.Linq;
 using System.Text;
 using BLL;
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 using AspNet = System.Web.UI.WebControls;
 
 namespace FineUIPro.Web.HSSE.Examine
diff --git a/SGGL/FineUIPro.Web/HSSE/Examine/LeadershipJoinHomeworkAnalysisMeetingEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Examine/LeadershipJoinHomeworkAnalysisMeetingEdit.aspx.cs
index db5ce0f..45587a0 100644
--- a/SGGL/FineUIPro.Web/HSSE/Examine/LeadershipJoinHomeworkAnalysisMeetingEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Examine/LeadershipJoinHomeworkAnalysisMeetingEdit.aspx.cs
@@ -1,5 +1,9 @@
 using BLL;
 using System;
+<<<<<<< HEAD
+using System.Web;
+=======
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.Examine
 {
diff --git a/SGGL/FineUIPro.Web/HSSE/Examine/MinusScoreSituation.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Examine/MinusScoreSituation.aspx.cs
index 79a0089..accfdee 100644
--- a/SGGL/FineUIPro.Web/HSSE/Examine/MinusScoreSituation.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Examine/MinusScoreSituation.aspx.cs
@@ -1,8 +1,19 @@
 using System;
+<<<<<<< HEAD
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Xml.Linq;
+using BLL;
+using static System.Runtime.CompilerServices.RuntimeHelpers;
+=======
 using System.Data;
 using System.Linq;
 using System.Text;
 using BLL;
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 using AspNet = System.Web.UI.WebControls;
 
 namespace FineUIPro.Web.HSSE.Examine
diff --git a/SGGL/FineUIPro.Web/HSSE/Examine/MinusScoreSituationEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Examine/MinusScoreSituationEdit.aspx.cs
index 9303d1e..4569409 100644
--- a/SGGL/FineUIPro.Web/HSSE/Examine/MinusScoreSituationEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Examine/MinusScoreSituationEdit.aspx.cs
@@ -1,5 +1,9 @@
 using BLL;
 using System;
+<<<<<<< HEAD
+using System.Web;
+=======
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.Examine
 {
diff --git a/SGGL/FineUIPro.Web/HSSE/Examine/OnePersonPerFile.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Examine/OnePersonPerFile.aspx.cs
index 2d3460c..d079668 100644
--- a/SGGL/FineUIPro.Web/HSSE/Examine/OnePersonPerFile.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Examine/OnePersonPerFile.aspx.cs
@@ -1,8 +1,17 @@
 using BLL;
 using System;
 using System.Collections.Generic;
+<<<<<<< HEAD
+using System.Configuration;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using AspNet = System.Web.UI.WebControls;
+=======
 using System.Data;
 using System.Linq;
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.Examine
 {
diff --git a/SGGL/FineUIPro.Web/HSSE/Examine/PersonalSafetyActionPlan.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Examine/PersonalSafetyActionPlan.aspx.cs
index 467988b..5083bf0 100644
--- a/SGGL/FineUIPro.Web/HSSE/Examine/PersonalSafetyActionPlan.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Examine/PersonalSafetyActionPlan.aspx.cs
@@ -1,8 +1,19 @@
 using System;
+<<<<<<< HEAD
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Xml.Linq;
+using BLL;
+using static System.Runtime.CompilerServices.RuntimeHelpers;
+=======
 using System.Data;
 using System.Linq;
 using System.Text;
 using BLL;
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 using AspNet = System.Web.UI.WebControls;
 
 namespace FineUIPro.Web.HSSE.Examine
diff --git a/SGGL/FineUIPro.Web/HSSE/Examine/PersonalSafetyActionPlanEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Examine/PersonalSafetyActionPlanEdit.aspx.cs
index 1aa6d91..53ec2bb 100644
--- a/SGGL/FineUIPro.Web/HSSE/Examine/PersonalSafetyActionPlanEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Examine/PersonalSafetyActionPlanEdit.aspx.cs
@@ -1,5 +1,9 @@
 using BLL;
 using System;
+<<<<<<< HEAD
+using System.Web;
+=======
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.Examine
 {
diff --git a/SGGL/FineUIPro.Web/HSSE/Examine/SharingOfSafetyExperience.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Examine/SharingOfSafetyExperience.aspx.cs
index c2c0124..be2490a 100644
--- a/SGGL/FineUIPro.Web/HSSE/Examine/SharingOfSafetyExperience.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Examine/SharingOfSafetyExperience.aspx.cs
@@ -1,4 +1,16 @@
 using System;
+<<<<<<< HEAD
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Xml.Linq;
+using BLL;
+using static System.Runtime.CompilerServices.RuntimeHelpers;
+using AspNet = System.Web.UI.WebControls;
+
+=======
 using System.Data;
 using System.Linq;
 using System.Text;
@@ -6,6 +18,7 @@ using BLL;
 using AspNet = System.Web.UI.WebControls;
 
 
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 namespace FineUIPro.Web.HSSE.Examine
 {
     public partial class SharingOfSafetyExperience : PageBase
diff --git a/SGGL/FineUIPro.Web/HSSE/Examine/SharingOfSafetyExperienceEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Examine/SharingOfSafetyExperienceEdit.aspx.cs
index 3a74b14..2d91c62 100644
--- a/SGGL/FineUIPro.Web/HSSE/Examine/SharingOfSafetyExperienceEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Examine/SharingOfSafetyExperienceEdit.aspx.cs
@@ -1,5 +1,9 @@
 using BLL;
 using System;
+<<<<<<< HEAD
+using System.Web;
+=======
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.Examine
 {
diff --git a/SGGL/FineUIPro.Web/HSSE/Examine/StaffHSEInfoArchives.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Examine/StaffHSEInfoArchives.aspx.cs
index eccd773..b7b5697 100644
--- a/SGGL/FineUIPro.Web/HSSE/Examine/StaffHSEInfoArchives.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Examine/StaffHSEInfoArchives.aspx.cs
@@ -1,7 +1,19 @@
 using BLL;
+<<<<<<< HEAD
+using FineUIPro.Web.HSSE.SitePerson;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using AspNet = System.Web.UI.WebControls;
+=======
 using System;
 using System.Data;
 using System.Linq;
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.Examine
 {
diff --git a/SGGL/FineUIPro.Web/HSSE/PostTraining/Category.aspx.cs b/SGGL/FineUIPro.Web/HSSE/PostTraining/Category.aspx.cs
index 9f6ba26..eafde08 100644
--- a/SGGL/FineUIPro.Web/HSSE/PostTraining/Category.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/PostTraining/Category.aspx.cs
@@ -1,7 +1,16 @@
 using System;
+<<<<<<< HEAD
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Xml.Linq;
+=======
 using System.Data;
 using System.Linq;
 using System.Text;
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 using BLL;
 using AspNet = System.Web.UI.WebControls;
 
diff --git a/SGGL/FineUIPro.Web/HSSE/PostTraining/CategoryEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/PostTraining/CategoryEdit.aspx.cs
index 700eb5d..ce99cb8 100644
--- a/SGGL/FineUIPro.Web/HSSE/PostTraining/CategoryEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/PostTraining/CategoryEdit.aspx.cs
@@ -1,5 +1,9 @@
 using BLL;
 using System;
+<<<<<<< HEAD
+using System.Web;
+=======
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.PostTraining
 {
diff --git a/SGGL/FineUIPro.Web/HSSE/PostTraining/Course.aspx.cs b/SGGL/FineUIPro.Web/HSSE/PostTraining/Course.aspx.cs
index fe50364..ac02b15 100644
--- a/SGGL/FineUIPro.Web/HSSE/PostTraining/Course.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/PostTraining/Course.aspx.cs
@@ -4,6 +4,10 @@ using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
 using System.Text;
+<<<<<<< HEAD
+using System.Xml.Linq;
+=======
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 using BLL;
 using AspNet = System.Web.UI.WebControls;
 
diff --git a/SGGL/FineUIPro.Web/HSSE/PostTraining/CourseDataIn.aspx.cs b/SGGL/FineUIPro.Web/HSSE/PostTraining/CourseDataIn.aspx.cs
index ac470e2..1eadfff 100644
--- a/SGGL/FineUIPro.Web/HSSE/PostTraining/CourseDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/PostTraining/CourseDataIn.aspx.cs
@@ -6,6 +6,11 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Web;
+<<<<<<< HEAD
+using System.Web.UI;
+using System.Web.UI.WebControls;
+=======
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.PostTraining
 {
diff --git a/SGGL/FineUIPro.Web/HSSE/PostTraining/CourseEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/PostTraining/CourseEdit.aspx.cs
index 1b67dcf..9920b55 100644
--- a/SGGL/FineUIPro.Web/HSSE/PostTraining/CourseEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/PostTraining/CourseEdit.aspx.cs
@@ -1,5 +1,9 @@
 using BLL;
 using System;
+<<<<<<< HEAD
+using System.Web;
+=======
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.PostTraining
 {
diff --git a/SGGL/FineUIPro.Web/HSSE/PostTraining/Method.aspx.cs b/SGGL/FineUIPro.Web/HSSE/PostTraining/Method.aspx.cs
index 9accc6b..7682c4e 100644
--- a/SGGL/FineUIPro.Web/HSSE/PostTraining/Method.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/PostTraining/Method.aspx.cs
@@ -1,7 +1,16 @@
 using System;
+<<<<<<< HEAD
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Xml.Linq;
+=======
 using System.Data;
 using System.Linq;
 using System.Text;
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 using BLL;
 using AspNet = System.Web.UI.WebControls;
 
diff --git a/SGGL/FineUIPro.Web/HSSE/PostTraining/MethodEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/PostTraining/MethodEdit.aspx.cs
index d8fd9e4..a74ac5e 100644
--- a/SGGL/FineUIPro.Web/HSSE/PostTraining/MethodEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/PostTraining/MethodEdit.aspx.cs
@@ -1,5 +1,9 @@
 using BLL;
 using System;
+<<<<<<< HEAD
+using System.Web;
+=======
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.PostTraining
 {
diff --git a/SGGL/FineUIPro.Web/HSSE/PostTraining/Role.aspx.cs b/SGGL/FineUIPro.Web/HSSE/PostTraining/Role.aspx.cs
index ab88eca..a8488ed 100644
--- a/SGGL/FineUIPro.Web/HSSE/PostTraining/Role.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/PostTraining/Role.aspx.cs
@@ -1,7 +1,16 @@
 using System;
+<<<<<<< HEAD
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Xml.Linq;
+=======
 using System.Data;
 using System.Linq;
 using System.Text;
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 using BLL;
 using AspNet = System.Web.UI.WebControls;
 
diff --git a/SGGL/FineUIPro.Web/HSSE/PostTraining/RoleEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/PostTraining/RoleEdit.aspx.cs
index bed80bc..3c3ffd9 100644
--- a/SGGL/FineUIPro.Web/HSSE/PostTraining/RoleEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/PostTraining/RoleEdit.aspx.cs
@@ -1,5 +1,9 @@
 using BLL;
 using System;
+<<<<<<< HEAD
+using System.Web;
+=======
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.PostTraining
 {
diff --git a/SGGL/FineUIPro.Web/HSSE/PostTraining/Standard.aspx b/SGGL/FineUIPro.Web/HSSE/PostTraining/Standard.aspx
index 0ef48f2..e57e760 100644
--- a/SGGL/FineUIPro.Web/HSSE/PostTraining/Standard.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/PostTraining/Standard.aspx
@@ -61,7 +61,11 @@
                         </f:Toolbar>
                     </Toolbars>
                     <Columns>
+<<<<<<< HEAD
+                        <f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center" EnableLock="true" Locked="true"
+=======
                         <f:TemplateField ColumnID="tfNumber" Width="60px" HeaderText="序号" HeaderTextAlign="Center" EnableLock="true" Locked="true"
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
                             TextAlign="Center">
                             <ItemTemplate>
                                 <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
diff --git a/SGGL/FineUIPro.Web/HSSE/PostTraining/Standard.aspx.cs b/SGGL/FineUIPro.Web/HSSE/PostTraining/Standard.aspx.cs
index e9e3668..fb6c1b4 100644
--- a/SGGL/FineUIPro.Web/HSSE/PostTraining/Standard.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/PostTraining/Standard.aspx.cs
@@ -4,6 +4,10 @@ using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
 using System.Text;
+<<<<<<< HEAD
+using System.Xml.Linq;
+=======
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 using BLL;
 using AspNet = System.Web.UI.WebControls;
 
@@ -99,7 +103,11 @@ namespace FineUIPro.Web.HSSE.PostTraining
             }
             if (this.drpRole.SelectedValue != BLL.Const._Null)
             {
+<<<<<<< HEAD
+                strSql += " AND Course.RoleId = @RoleId";
+=======
                 strSql += " AND Standard.RoleId = @RoleId";
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
                 listStr.Add(new SqlParameter("@RoleId", this.drpRole.SelectedValue));
             }
             if (this.drpCategory.SelectedValue != BLL.Const._Null)
diff --git a/SGGL/FineUIPro.Web/HSSE/PostTraining/StandardDataIn.aspx.cs b/SGGL/FineUIPro.Web/HSSE/PostTraining/StandardDataIn.aspx.cs
index f362558..8973758 100644
--- a/SGGL/FineUIPro.Web/HSSE/PostTraining/StandardDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/PostTraining/StandardDataIn.aspx.cs
@@ -6,6 +6,11 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Web;
+<<<<<<< HEAD
+using System.Web.UI;
+using System.Web.UI.WebControls;
+=======
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.PostTraining
 {
diff --git a/SGGL/FineUIPro.Web/HSSE/PostTraining/StandardEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/PostTraining/StandardEdit.aspx.cs
index f76464f..b5e6ffa 100644
--- a/SGGL/FineUIPro.Web/HSSE/PostTraining/StandardEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/PostTraining/StandardEdit.aspx.cs
@@ -1,5 +1,11 @@
 using BLL;
+<<<<<<< HEAD
+using Microsoft.Office.Interop.Excel;
 using System;
+using System.Web;
+=======
+using System;
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.PostTraining
 {
@@ -161,7 +167,11 @@ namespace FineUIPro.Web.HSSE.PostTraining
             //newModel.RoleId = this.drpRole.SelectedValue;
             newModel.CourseId = this.drpCourse.SelectedValue;
             newModel.ClassHour = decimal.Parse(this.txtClassHour.Text.Trim());
+<<<<<<< HEAD
+            newModel.Cycle = int.Parse(this.txtCycle.Text.Trim());
+=======
             newModel.Cycle = decimal.Parse(this.txtCycle.Text.Trim());
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
             newModel.Method = this.drpMethod.SelectedText;
             newModel.Outcome = this.drpOutcome.SelectedText;
             newModel.Teachers = this.drpTeachers.SelectedText;
diff --git a/SGGL/FineUIPro.Web/HSSE/PostTraining/Teachers.aspx.cs b/SGGL/FineUIPro.Web/HSSE/PostTraining/Teachers.aspx.cs
index c2dec71..b3e69a6 100644
--- a/SGGL/FineUIPro.Web/HSSE/PostTraining/Teachers.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/PostTraining/Teachers.aspx.cs
@@ -1,7 +1,16 @@
 using System;
+<<<<<<< HEAD
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Xml.Linq;
+=======
 using System.Data;
 using System.Linq;
 using System.Text;
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 using BLL;
 using AspNet = System.Web.UI.WebControls;
 
diff --git a/SGGL/FineUIPro.Web/HSSE/PostTraining/TeachersEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/PostTraining/TeachersEdit.aspx.cs
index c52a92d..84bed8c 100644
--- a/SGGL/FineUIPro.Web/HSSE/PostTraining/TeachersEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/PostTraining/TeachersEdit.aspx.cs
@@ -1,5 +1,9 @@
 using BLL;
 using System;
+<<<<<<< HEAD
+using System.Web;
+=======
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.PostTraining
 {