Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgFactoryInfo.java

 package com.yeejoin.amos.boot.module.ymt.api.entity;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 安全追溯-制造信息
@@ -16,13 +23,20 @@ import java.util.Date;
  * @date 2023-08-17
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("idx_biz_jg_factory_info")
-public class IdxBizJgFactoryInfo extends TzsBaseEntity {
+@TableName(value = "idx_biz_jg_factory_info", autoResultMap = true)
+public class IdxBizJgFactoryInfo implements Serializable {
 
-    
+    private static final long serialVersionUID = 1L;
 
+    @TableId(type = IdType.UUID)
+    protected String sequenceNbr;
+
+    @TableField("\"REC_DATE\"")
+    protected Date recDate;
+
+    @TableField("\"REC_USER_ID\"")
+    protected String recUserId;
 
     /**
      *
@@ -120,4 +134,22 @@ public class IdxBizJgFactoryInfo extends TzsBaseEntity {
 	@TableField("\"OTHER_ACCESSORIES_FACT\"")
     private String otherAccessoriesFact;
 
+
+
+    /**
+     *  	 * 制造监督检验报告
+     *      */
+
+    @TableField(value ="\"FACT_SUPERVISION_INSPECTION_REPORT\"",typeHandler = JacksonTypeHandler.class)
+    private JSONArray factSupervisionInspectionReport;
+
+
+
+    /**
+     *  	 * 锅炉能效证明文件
+     *      */
+
+    @TableField(value ="\"BOILER_ENERGY_EFFICIENCY_CERTIFICATE\"",typeHandler = JacksonTypeHandler.class)
+    private JSONArray boilerEnergyEfficiencyCertificate;
+
 }