1.调整表结构 ，检验检测资质和单位许可使用一张表

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

@@ -19,7 +19,6 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("tz_base_unit_licence")
 @ApiModel(value="TzBaseUnitLicence对象", description="单位许可信息表")
 public class TzBaseUnitLicenceDto extends BaseDto {
 
@@ -40,7 +39,7 @@ public class TzBaseUnitLicenceDto extends BaseDto {
     @ApiModelProperty(value = "证书类型code")
     private String certTypeCode;
 
-    @ApiModelProperty(value = "证书编号")
+    @ApiModelProperty(value = "证书编号（核准证编号）")
     private String certNo;
 
     @ApiModelProperty(value = "有效期至")
@@ -73,10 +72,10 @@ public class TzBaseUnitLicenceDto extends BaseDto {
     @ApiModelProperty(value = "备注")
     private String remark;
 
-    @ApiModelProperty(value = "许可项目/检验类型/设备品种编码")
+    @ApiModelProperty(value = "许可项目/检验类型/设备品种编码（核准项目代码）")
     private String itemCode;
 
-    @ApiModelProperty(value = "许可项目/检验类型/设备品种")
+    @ApiModelProperty(value = "许可项目/检验类型/设备品种（核准项目名称）")
     private String itemCodeName;
 
     @ApiModelProperty(value = "许可子项目/检验项目/充装介质类别code")
@@ -94,5 +93,14 @@ public class TzBaseUnitLicenceDto extends BaseDto {
     @ApiModelProperty(value = "固定检验地址")
     private String itemAddress;
 
+    @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-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/entity/TzBaseUnitLicence.java

@@ -6,6 +6,7 @@ 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;
 
 /**
@@ -38,7 +39,7 @@ public class TzBaseUnitLicence extends BaseEntity {
     @ApiModelProperty(value = "证书类型code")
     private String certTypeCode;
 
-    @ApiModelProperty(value = "证书编号")
+    @ApiModelProperty(value = "证书编号(核准证编号)")
     private String certNo;
 
     @ApiModelProperty(value = "有效期至")
@@ -71,10 +72,10 @@ public class TzBaseUnitLicence extends BaseEntity {
     @ApiModelProperty(value = "备注")
     private String remark;
 
-    @ApiModelProperty(value = "许可项目/检验类型/设备品种编码")
+    @ApiModelProperty(value = "许可项目/检验类型/设备品种编码（核准项目代码）")
     private String itemCode;
 
-    @ApiModelProperty(value = "许可项目/检验类型/设备品种")
+    @ApiModelProperty(value = "许可项目/检验类型/设备品种（核准项目名称）")
     private String itemCodeName;
 
     @ApiModelProperty(value = "许可子项目/检验项目/充装介质类别code")
@@ -92,13 +93,20 @@ public class TzBaseUnitLicence extends BaseEntity {
     @ApiModelProperty(value = "固定检验地址")
     private String itemAddress;
 
-
     @ApiModelProperty(value = "更新人名称")
     private String recUserName;
 
-
     @ApiModelProperty(value = "是否删除（0：未删除，1：已删除）")
     private Boolean isDelete;
 
+    @ApiModelProperty(value = "机构类别枚举")
+    private String agencyType;
+
+    @ApiModelProperty(value = "机构类别枚举名称，冗余")
+    private String agencyTypeCode;
+
+    @ApiModelProperty(value = "资质类型编码（检验检测、其他）")
+    private String licenceType;
+
 
 }