From f035e4df06d4e7f4baa4b20d36cffb8f83813204 Mon Sep 17 00:00:00 2001
From: GUO <1923636941@qq.com>
Date: Thu, 16 May 2024 22:17:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E7=81=AB=E4=BA=BA=E5=AE=9E=E4=BD=93?=
 =?UTF-8?q?=E7=B1=BB=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/XzSpecialOperationFireSafety.java  | 98 ++++++-------------
 1 file changed, 29 insertions(+), 69 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzSpecialOperationFireSafety.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzSpecialOperationFireSafety.java
index 382371dd6..677d0d4d2 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzSpecialOperationFireSafety.java
+++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzSpecialOperationFireSafety.java
@@ -45,41 +45,11 @@ public class XzSpecialOperationFireSafety implements Serializable {
     @ApiModelProperty(value = "作业单位")
     private java.lang.Long operatingUnit;
     /**
-     * 动火人
+     * 动火人及证书编号
      */
-    @Excel(name = "动火人", width = 15)
-    @ApiModelProperty(value = "动火人")
-    private java.lang.Long fireman;
-    /**
-     * 作业负责人
-     */
-    @Excel(name = "作业负责人", width = 15)
-    @ApiModelProperty(value = "作业负责人")
-    private java.lang.Long assignmentPersonInCharge;
-    /**
-     * 安全交底人
-     */
-    @Excel(name = "安全交底人", width = 15)
-    @ApiModelProperty(value = "安全交底人")
-    private java.lang.Long safetyInformant;
-    /**
-     * 接受交底人
-     */
-    @Excel(name = "接受交底人", width = 15)
-    @ApiModelProperty(value = "接受交底人")
-    private java.lang.Long acceptTheInformant;
-    /**
-     * 监护人
-     */
-    @Excel(name = "监护人", width = 15)
-    @ApiModelProperty(value = "监护人")
-    private java.lang.Long guardian;
-    /**
-     * 证书编号
-     */
-    @Excel(name = "证书编号", width = 15)
-    @ApiModelProperty(value = "证书编号")
-    private java.lang.String certificateNo;
+    @Excel(name = "动火人及证书编号", width = 15)
+    @ApiModelProperty(value = "动火人及证书编号")
+    private java.lang.String firemanAndCertificateNo;
     /**
      * 风险辨识结果
      */
@@ -171,6 +141,31 @@ public class XzSpecialOperationFireSafety implements Serializable {
     @ApiModelProperty(value = "最终验收状态1进行中2已闭合")
     private Integer finalAcceptanceStatus;
 
+    /**
+     * 作业负责人名称
+     */
+    @Excel(name = "作业负责人名称", width = 15)
+    @ApiModelProperty(value = "作业负责人名称")
+    private java.lang.String assignmentPersonInChargeName;
+    /**
+     * 安全交底人名称
+     */
+    @Excel(name = "安全交底人名称", width = 15)
+    @ApiModelProperty(value = "安全交底人名称")
+    private java.lang.String safetyInformantName;
+    /**
+     * 接受交底人名称
+     */
+    @Excel(name = "接受交底人名称", width = 15)
+    @ApiModelProperty(value = "接受交底人名称")
+    private java.lang.String acceptTheInformantName;
+    /**
+     * 监护人名称
+     */
+    @Excel(name = "监护人名称", width = 15)
+    @ApiModelProperty(value = "监护人名称")
+    private java.lang.String guardianName;
+
     /**
      * 作业申请单位名称
      */
@@ -185,41 +180,6 @@ public class XzSpecialOperationFireSafety implements Serializable {
     @Excel(name = "作业单位名称", width = 15)
     @ApiModelProperty(value = "作业单位名称")
     private java.lang.String operatingUnitName;
-    /**
-     * 动火人名称
-     */
-    @TableField(exist = false)
-    @Excel(name = "动火人名称", width = 15)
-    @ApiModelProperty(value = "动火人名称")
-    private java.lang.String firemanName;
-    /**
-     * 作业负责人名称
-     */
-    @TableField(exist = false)
-    @Excel(name = "作业负责人名称", width = 15)
-    @ApiModelProperty(value = "作业负责人名称")
-    private java.lang.String assignmentPersonInChargeName;
-    /**
-     * 安全交底人名称
-     */
-    @TableField(exist = false)
-    @Excel(name = "安全交底人名称", width = 15)
-    @ApiModelProperty(value = "安全交底人名称")
-    private java.lang.String safetyInformantName;
-    /**
-     * 接受交底人名称
-     */
-    @TableField(exist = false)
-    @Excel(name = "接受交底人名称", width = 15)
-    @ApiModelProperty(value = "接受交底人名称")
-    private java.lang.String acceptTheInformantName;
-    /**
-     * 监护人名称
-     */
-    @TableField(exist = false)
-    @Excel(name = "监护人名称", width = 15)
-    @ApiModelProperty(value = "监护人名称")
-    private java.lang.String guardianName;
 
     @TableField(exist = false)
     @ApiModelProperty(value = "星纵-气体分析列表")