Merge remote-tracking branch 'origin/dev' into prod

yd-base-api/src/main/java/com/yd/base/api/service/impl/ApiRelObjectCertificateServiceImpl.java

@@ -64,6 +64,7 @@ public class ApiRelObjectCertificateServiceImpl implements ApiRelObjectCertifica
                         BeanUtils.copyProperties(request,relObjectCertificate);
                         BeanUtils.copyProperties(dto,relObjectCertificate);
                         relObjectCertificate.setRelObjectCertificateBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_REL_OBJECT_CERTIFICATE.getCode()));
+                        relObjectCertificate.setId(null);
                         return relObjectCertificate;
                     }).collect(Collectors.toList());
             iRelObjectCertificateService.saveOrUpdateBatch(addList);

yd-base-feign/src/main/java/com/yd/base/feign/dto/ApiCertificateDto.java

@@ -10,6 +10,11 @@ import java.time.LocalDateTime;
 public class ApiCertificateDto {
 
     /**
+     * 主键ID
+     */
+    private Long id;
+
+    /**
      * 证件类型
      */
     private String documentType;