From d6f47fb4a74390b65d84b5939d3b39934701f4f8 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Wed, 25 Sep 2024 09:23:20 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/HSSE/Hazard/LocationSelect.aspx.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SGGL/FineUIPro.Web/HSSE/Hazard/LocationSelect.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Hazard/LocationSelect.aspx.cs
index bdf67f31..2db3d39f 100644
--- a/SGGL/FineUIPro.Web/HSSE/Hazard/LocationSelect.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Hazard/LocationSelect.aspx.cs
@@ -25,7 +25,7 @@ namespace FineUIPro.Web.HSSE.Hazard
             {
                 ProjectCode = BLL.ProjectService.GetProjectCodeByProjectId(this.CurrUser.LoginProjectId);
                 ConstructionRiskId =  Request.Params["ConstructionRiskId"] ;
-                if (!string.IsNullOrEmpty(Request.Params["type"]))
+                if (!string.IsNullOrEmpty(Request.Params["type"])) 
                 {
                     this.btnSave.Hidden = true;
                 }

From a93a3a283bc8d171d0452c5234e7bf25920d3b29 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Wed, 25 Sep 2024 09:27:38 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DataBase/版本日志/SGGLDB_V2024-09-24.sql | 98 ++++++++++++++++++++++++
 1 file changed, 98 insertions(+)
 create mode 100644 DataBase/版本日志/SGGLDB_V2024-09-24.sql

diff --git a/DataBase/版本日志/SGGLDB_V2024-09-24.sql b/DataBase/版本日志/SGGLDB_V2024-09-24.sql
new file mode 100644
index 00000000..c502077a
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_V2024-09-24.sql
@@ -0,0 +1,98 @@
+
+INSERT INTO dbo.Sys_ButtonToMenu (ButtonToMenuId, MenuId, ButtonName, SortIndex) VALUES (N'FD1ED6C2-93BD-412F-A0B6-661F44339CA8', N'BCCA4D81-410C-4746-B1E4-F882BC3A25F4', N'ÐÞ¸Ä', 4);
+go
+alter table dbo.Tw_InOutPlanMaster
+    add AuditMan nvarchar(50)
+go
+
+exec sp_addextendedproperty 'MS_Description', N'ÉóºËÈË', 'SCHEMA', 'dbo', 'TABLE', 'Tw_InOutPlanMaster', 'COLUMN',
+     'AuditMan'
+go
+
+alter table dbo.Tw_InOutPlanMaster
+    add AuditDate datetime
+go
+
+exec sp_addextendedproperty 'MS_Description', N'ÉóºËʱ¼ä', 'SCHEMA', 'dbo', 'TABLE', 'Tw_InOutPlanMaster', 'COLUMN',
+     'AuditDate'
+go
+alter table dbo.Tw_InputMaster
+    add AuditMan nvarchar(50)
+go
+
+exec sp_addextendedproperty 'MS_Description', N'ÉóºËÈË', 'SCHEMA', 'dbo', 'TABLE', 'Tw_InputMaster', 'COLUMN',
+     'AuditMan'
+go
+
+alter table dbo.Tw_InputMaster
+    add AuditDate datetime
+go
+
+exec sp_addextendedproperty 'MS_Description', N'ÉóºËʱ¼ä', 'SCHEMA', 'dbo', 'TABLE', 'Tw_InputMaster', 'COLUMN',
+     'AuditDate'
+go
+alter table dbo.Tw_OutputMaster
+    add AuditMan nvarchar(50)
+go
+
+exec sp_addextendedproperty 'MS_Description', N'ÉóºËÈË', 'SCHEMA', 'dbo', 'TABLE', 'Tw_OutputMaster', 'COLUMN',
+     'AuditMan'
+go
+
+alter table dbo.Tw_OutputMaster
+    add AuditDate datetime
+go
+
+exec sp_addextendedproperty 'MS_Description', N'ÉóºËʱ¼ä', 'SCHEMA', 'dbo', 'TABLE', 'Tw_OutputMaster', 'COLUMN',
+     'AuditDate'
+go
+alter table dbo.Tw_InOutPlanMaster
+    add Remark nvarchar(200)
+go
+alter table dbo.Tw_InputMaster
+    add Remark nvarchar(200)
+go
+alter table dbo.Tw_InOutPlanMaster
+    add AuditMan2 nvarchar(50)
+go
+
+exec sp_addextendedproperty 'MS_Description', N'ר¹¤ÉóºËÈË', 'SCHEMA', 'dbo', 'TABLE', 'Tw_InOutPlanMaster', 'COLUMN',
+     'AuditMan2'
+go
+
+alter table dbo.Tw_InOutPlanMaster
+    add AuditDate2 datetime
+go
+
+exec sp_addextendedproperty 'MS_Description', N'ר¹¤ÉóºËʱ¼ä', 'SCHEMA', 'dbo', 'TABLE', 'Tw_InOutPlanMaster', 'COLUMN',
+     'AuditDate2'
+go
+
+
+
+alter table dbo.HJGL_PipeLineMat
+    add IsLooseParts BIT
+go
+
+exec sp_addextendedproperty 'MS_Description', N'ÊÇ·ñÉ¢¼þ', 'SCHEMA', 'dbo', 'TABLE', 'HJGL_PipeLineMat', 'COLUMN',
+     'IsLooseParts'
+go
+
+
+
+
+
+
+-- auto-generated definition
+create table dbo.Tw_InOutPlanDetail_Relation
+(
+    Id                  nvarchar(50) not null
+        constraint Tw_InOutPlanDetail_Relation_pk
+            primary key,
+    PipelineId   nvarchar(50),
+    InOutPlanMasterId   nvarchar(50),
+    MaterialCode        nvarchar(50),
+    PrefabricatedComponents nvarchar(100),
+    Number             decimal(9, 2),
+)
+go
\ No newline at end of file