feature 代码提交

js-security/security-entity/src/main/java/com/rongwe/scentity/domian/ApsHazardInvestigationTemplateDo.java

@@ -42,6 +42,7 @@ public class ApsHazardInvestigationTemplateDo extends BaseDo implements Serializ
      */
     private String templatename;
 
+
     /**
      * 检查类型
      */
@@ -69,18 +70,22 @@ public class ApsHazardInvestigationTemplateDo extends BaseDo implements Serializ
     /**
      * 巡检周期
      */
+    @Deprecated
     private int inspectioncycle;
     /**
      * 巡检周期单位
      */
+    @Deprecated
     private String inspectioncycleunit;
     /**
      * 工作开始时间
      */
+    @Deprecated
     private String startingtimeofwork;
     /**
      * 工作结束时间
      */
+    @Deprecated
     private String endtimeofwork;
     /**
      * 上次记录的生成时间

js-security/security-entity/src/main/java/com/rongwe/scentity/domian/ApsHazardInvestigationTemplateZibiaoDo.java

@@ -125,7 +125,7 @@ public class ApsHazardInvestigationTemplateZibiaoDo extends BaseDo implements Se
     private String inspector;
 
     /**
-     * 检查项ID
+     * 管控措施ID
      */
     private String checkitemid;
     /**

js-security/security-entity/src/main/java/com/rongwe/scentity/domian/AspRiskControlMeasuresDo.java

@@ -1,6 +1,5 @@
 package com.rongwe.scentity.domian;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -26,30 +25,6 @@ public class AspRiskControlMeasuresDo extends BaseDo implements Serializable {
 
     private String tenantId;
 
-    private String rOption;
-
-    private String deleted;
-
-    private String remark;
-
-    // 创建日期
-    private Date createdate;
-
-    // 创建用户ID
-    private String createuserid;
-
-    // 修改日期
-    private Date modifydate;
-
-    // 修改用户ID
-    private String modifyuserid;
-
-    // 创建用户名
-    private String createusername;
-
-    // 修改用户名
-    private String modifyusername;
-
     private String riskEventName;
 
     private String riskEventId;
@@ -76,6 +51,23 @@ public class AspRiskControlMeasuresDo extends BaseDo implements Serializable {
 
     private String contollecel; // 注意：字段名可能拼写错误，原字段可能是controlExcel或controlCell
 
+
+    /**
+     * 巡检周期
+     */
+    private int inspectioncycle;
+    /**
+     * 巡检周期单位
+     */
+    private String  inspectioncycleunit;
+    /**
+     * 工作开始时间
+     */
+    private String  startingtimeofwork;
+    /**
+     * 工作结束时间
+     */
+    private String  endtimeofwork;
     /**
      * 企业编码
      */