This commit is contained in:
2025-02-25 16:41:38 +08:00
40 changed files with 280 additions and 1 deletions
@@ -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
@@ -1,5 +1,9 @@
using BLL;
using System;
<<<<<<< HEAD
using System.Web;
=======
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
namespace FineUIPro.Web.HSSE.Examine
{
@@ -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
@@ -1,5 +1,9 @@
using BLL;
using System;
<<<<<<< HEAD
using System.Web;
=======
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
namespace FineUIPro.Web.HSSE.Examine
{
@@ -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
@@ -1,5 +1,9 @@
using BLL;
using System;
<<<<<<< HEAD
using System.Web;
=======
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
namespace FineUIPro.Web.HSSE.Examine
{
@@ -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
@@ -1,5 +1,9 @@
using BLL;
using System;
<<<<<<< HEAD
using System.Web;
=======
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
namespace FineUIPro.Web.HSSE.Examine
{
@@ -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
@@ -1,5 +1,9 @@
using BLL;
using System;
<<<<<<< HEAD
using System.Web;
=======
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
namespace FineUIPro.Web.HSSE.Examine
{
@@ -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
{
@@ -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
@@ -1,5 +1,9 @@
using BLL;
using System;
<<<<<<< HEAD
using System.Web;
=======
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
namespace FineUIPro.Web.HSSE.Examine
{
@@ -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
@@ -1,5 +1,9 @@
using BLL;
using System;
<<<<<<< HEAD
using System.Web;
=======
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
namespace FineUIPro.Web.HSSE.Examine
{
@@ -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
{