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

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcOpeningApplicationServiceImpl.java

@@ -300,7 +300,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
             if(op.equals("0")){
                 String originalDataId = params.get("originalDataId").toString();
                 JyjcOpeningApplication jyjcOpeningApplication=jyjcOpeningApplicationMapper.selectById(originalDataId);
-                List<String> detectionRegion = Arrays.asList(params.get("detectionRegion").toString().split(",")) ;
+                List<String> detectionRegion = Arrays.asList(params.get("detectionRegion").toString().replace("[","").replace("]","").split(",")) ;
 //                String detectionRegionName =  params.get("detectionRegionName").toString();
                 jyjcOpeningApplication.setDetectionRegion(detectionRegion);
 //                jyjcOpeningApplication.setDetectionRegionName(detectionRegionName);

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

@@ -102,7 +102,7 @@ public class BaseUnitLicenceDto extends BaseDto {
     private String agencyType;
 
     @ApiModelProperty(value = "机构类别枚举名称，冗余")
-    private String agencyTypeCode;
+    private String agencyTypeName;
 
     @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/dto/TzBaseUnitLicenceDto.java

@@ -97,7 +97,7 @@ public class TzBaseUnitLicenceDto extends BaseDto {
     private String agencyType;
 
     @ApiModelProperty(value = "机构类别枚举名称，冗余")
-    private String agencyTypeCode;
+    private String agencyTypeName;
 
     @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/BaseUnitLicence.java

@@ -25,6 +25,7 @@ public class BaseUnitLicence extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
+
     /**
      * 单位编码
      */
@@ -176,7 +177,7 @@ public class BaseUnitLicence extends BaseEntity {
     private String agencyType;
 
     @ApiModelProperty(value = "机构类别枚举名称，冗余")
-    private String agencyTypeCode;
+    private String agencyTypeName;
 
     @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

@@ -102,7 +102,7 @@ public class TzBaseUnitLicence extends BaseEntity {
     private String agencyType;
 
     @ApiModelProperty(value = "机构类别枚举名称，冗余")
-    private String agencyTypeCode;
+    private String agencyTypeName;
 
     @ApiModelProperty(value = "资质类型编码（检验检测、其他）")
     private String licenceType;

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/resources/application.properties

-spring.application.name=TZS-COMMON-tb
+spring.application.name=TZS-COMMON
 server.servlet.context-path=/tcm
 server.port=11002
 spring.profiles.active=dev