1.注册代码调整

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-common/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/BaseUnitLicenceDto.java

 package com.yeejoin.amos.boot.module.tcm.api.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import java.util.Date;
 
 /**
@@ -16,10 +17,10 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="BaseUnitLicenceDto", description="单位注册许可信息表")
-public class BaseUnitLicenceDto  extends BaseDto {
+@ApiModel(value = "BaseUnitLicenceDto", description = "单位注册许可信息表")
+public class BaseUnitLicenceDto extends BaseDto {
 
-   private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
 
     @ApiModelProperty(value = "单位编码")
@@ -37,7 +38,7 @@ public class BaseUnitLicenceDto  extends BaseDto {
     @ApiModelProperty(value = "证书类型code")
     private String certTypeCode;
 
-    @ApiModelProperty(value = "证书编号")
+    @ApiModelProperty(value = "证书编号(核准证编号)")
     private String certNo;
 
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -67,10 +68,10 @@ public class BaseUnitLicenceDto  extends BaseDto {
     @ApiModelProperty(value = "备注")
     private String remark;
 
-    @ApiModelProperty(value = "许可项目/检验类型/设备品种编码")
+    @ApiModelProperty(value = "许可项目/检验类型/设备品种编码（核准项目代码）")
     private String itemCode;
 
-    @ApiModelProperty(value = "许可项目/检验类型/设备品种")
+    @ApiModelProperty(value = "许可项目/检验类型/设备品种（核准项目名称）")
     private String itemCodeName;
 
     @ApiModelProperty(value = "许可子项目/检验项目/充装介质类别code")
@@ -97,4 +98,13 @@ public class BaseUnitLicenceDto  extends BaseDto {
     @ApiModelProperty(value = "是否同步自许可（1是 0否）")
     private String isNotSync;
 
+    @ApiModelProperty(value = "机构类别枚举")
+    private String agencyType;
+
+    @ApiModelProperty(value = "机构类别枚举名称，冗余")
+    private String agencyTypeCode;
+
+    @ApiModelProperty(value = "资质类型编码（检验检测、其他）")
+    private String licenceType;
+
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-common/src/main/java/com/yeejoin/amos/boot/module/tcm/api/entity/BaseUnitLicence.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -56,7 +57,7 @@ public class BaseUnitLicence extends BaseEntity {
     private String certTypeCode;
 
     /**
-     * 证书编号
+     * 证书编号(核准证编号)
      */
 	@TableField("cert_no")
     private String certNo;
@@ -112,13 +113,13 @@ public class BaseUnitLicence extends BaseEntity {
     private String remark;
 
     /**
-     * 许可项目/检验类型/设备品种编码
+     * 许可项目/检验类型/设备品种编码（核准项目代码）
      */
 	@TableField("item_code")
     private String itemCode;
 
     /**
-     * 许可项目/检验类型/设备品种
+     * 许可项目/检验类型/设备品种（核准项目名称）
      */
 	@TableField("item_code_name")
     private String itemCodeName;
@@ -170,4 +171,14 @@ public class BaseUnitLicence extends BaseEntity {
     @TableField("is_not_sync")
     private String isNotSync;
 
+
+    @ApiModelProperty(value = "机构类别枚举")
+    private String agencyType;
+
+    @ApiModelProperty(value = "机构类别枚举名称，冗余")
+    private String agencyTypeCode;
+
+    @ApiModelProperty(value = "资质类型编码（检验检测、其他）")
+    private String licenceType;
+
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-common/src/main/java/com/yeejoin/amos/boot/module/tcm/api/entity/TzBaseUnitLicence.java

@@ -6,7 +6,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
-import org.elasticsearch.common.recycler.Recycler;
 import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 
 /**