Merge branch 'feature-tds-v1.0.0' into 'develop'

可信空间连接器入住接口

See merge request !6

@@ -267,14 +267,20 @@ public class EnterpriseRSVO {
     @SystemParamsDict(dictTypeName = "证件类型", codeFieldName = "handlePersonIdType")
     @SystemParamsDict(dictTypeName = "证件类型", codeFieldName = "handlePersonIdType")
     private String handlePersonIdTypeName;
     private String handlePersonIdTypeName;
 
 
-    @Schema(description = "可信凭证颁发日期")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date tdsVoucherDate;
+    /**
+     * 可信身份凭证
+     */
+    @Schema(description = "可信身份凭证")
+    private String trustedIdentityCredential;
 
 
-    @Schema(description = "可信身份凭证url")
-    private String tdsVoucherUrl;
+    /**
+     * 凭证颁发日期
+     */
+    @Schema(description = "凭证颁发日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date credentialTime;
 
 
-    private String tdsVoucherUnit="北京传世博润科技有限公司";
+    private String trustedIdentityCredentialUnit="北京传世博润科技有限公司";
 
 
     /******** 库表存储属性 需处理 *****/
     /******** 库表存储属性 需处理 *****/
 
 

@@ -83,7 +83,7 @@ public class TdsConnectorIdentityRQVO extends FlowRQBaseVO {
      * 可信身份凭证
      * 可信身份凭证
      */
      */
     @Schema(description = "可信身份凭证")
     @Schema(description = "可信身份凭证")
-    private JSONArray trustedIdentityCredential;
+    private String trustedIdentityCredential;
     
     
     /**
     /**
      * 凭证颁发日期
      * 凭证颁发日期

@@ -71,7 +71,7 @@ public class TdsConnectorIdentityRSVO extends BaseVO {
      * 可信身份凭证
      * 可信身份凭证
      */
      */
     @Schema(description = "可信身份凭证")
     @Schema(description = "可信身份凭证")
-    private Map<String,String> trustedIdentityCredential;
+    private String trustedIdentityCredential;
 
 
     /**
     /**
      * 凭证颁发日期
      * 凭证颁发日期

@@ -2,6 +2,7 @@ package com.csbr.qingcloud.portal.mybatis.entity;
 
 
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import csbr.cloud.entity.domain.base.dao.BaseDO;
 import csbr.cloud.entity.domain.base.dao.BaseDO;
 import jdk.jfr.Name;
 import jdk.jfr.Name;
 import lombok.Data;
 import lombok.Data;
@@ -220,9 +221,15 @@ public class MfEnterprise extends BaseDO {
     @Name("经办人证件类型")
     @Name("经办人证件类型")
     private String handlePersonIdType;
     private String handlePersonIdType;
 
 
-    @Name("可信凭证颁发日期")
-    private Date tdsVoucherDate;
+    /**
+     * 可信身份凭证
+     */
+    @Name("可信身份凭证")
+    private String trustedIdentityCredential;
 
 
-    @Name("可信身份凭证url")
-    private String tdsVoucherUrl;
+    /**
+     * 凭证颁发日期
+     */
+    @Name("凭证颁发日期")
+    private Date credentialTime;
 }
 }

@@ -75,8 +75,7 @@ public class MfTdsConnectorIdentity extends BaseShardingDO {
     * 可信身份凭证
     * 可信身份凭证
     */
     */
     @Name("可信身份凭证")
     @Name("可信身份凭证")
-    @TableField(typeHandler = FastjsonTypeHandler.class)
-    private JSONArray trustedIdentityCredential;
+    private String trustedIdentityCredential;
     
     
     /**
     /**
     * 凭证颁发日期
     * 凭证颁发日期