Merge remote-tracking branch 'origin/master'

one-certificate-manager/src/main/java/com/mortals/xhx/module/certificate/web/CertificateCatalogController.java

@@ -55,7 +55,7 @@ public class CertificateCatalogController extends BaseCRUDJsonBodyMappingControl
         this.addDict(model,"inspect", IBaseEnum.getEnumMap(YesNoEnum.class));
 
         this.addDict(model,"documentId", certificateDocumentService.find(new CertificateDocumentQuery())
-                .stream().collect(Collectors.toMap(x->x.getId(),y->y.getDocumentName(),(o,n)->n)));
+                .stream().collect(Collectors.toMap(x->x.getId().toString(),y->y.getDocumentName(),(o,n)->n)));
 
         super.init(model, context);
     }

one-certificate-manager/src/main/java/com/mortals/xhx/module/child/web/ChildLicenseController.java

@@ -59,7 +59,7 @@ public class ChildLicenseController extends BaseCRUDJsonBodyMappingController<Ch
         this.addDict(model, "processStatus", ProcessStatusEnum.getEnumMap());
 
         this.addDict(model, "documentId", certificateDocumentService.find(new CertificateDocumentQuery())
-                .stream().collect(Collectors.toMap(x -> x.getId(), y -> y.getDocumentName(), (o, n) -> n)));
+                .stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getDocumentName(), (o, n) -> n)));
 
 
         super.init(model, context);

one-certificate-manager/src/test/java/com/mortals/httpclient/child/ChildLicenseController.http

@@ -63,7 +63,7 @@ client.global.set("ChildLicense_id", JSON.parse(response.body).data.id);
 %}
 
 ###行业许可子证查看
-GET {{baseUrl}}/child/license/info?id=1
+GET {{baseUrl}}/child/license/interview?id=1
 
 ###行业许可子证编辑
 GET {{baseUrl}}/child/license/edit?id=1