Merge branch 'dev_zxm_main' into test

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiAppointmentServiceImpl.java

@@ -364,7 +364,8 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
         updateFnaBizIdAndNo(appointment.getFnaBizId(), appointment.getAppointmentBizId(), appointment.getAppointmentNo());
         updateFnaBizIdAndNo(appointment.getFnaBizId(), appointment.getAppointmentBizId(), appointment.getAppointmentNo());
         //新增健康问卷和预约对象关系绑定
         //新增健康问卷和预约对象关系绑定
         objectSaveJkQuestion(appointment.getAppointmentBizId(),request.getApiAnswerSaveRequest());
         objectSaveJkQuestion(appointment.getAppointmentBizId(),request.getApiAnswerSaveRequest());
-
+        //新增对象材料关系信息
+        addRelObjectMaterialList(appointment.getAppointmentBizId(),request.getMaterialDtoList());
         return Result.success();
         return Result.success();
     }
     }
 
 

yd-csf-feign/src/main/java/com/yd/csf/feign/request/appointment/ApiAppointmentAddStorageRequest.java

@@ -44,6 +44,11 @@ public class ApiAppointmentAddStorageRequest {
     private ApiSecondHolderInfoDto apiSecondHolderInfoDto;
     private ApiSecondHolderInfoDto apiSecondHolderInfoDto;
 
 
     /**
     /**
+     * 附件信息
+     */
+    private List<ApiAppointmentMaterialDto> materialDtoList;
+
+    /**
      * 问卷-答题提交对象
      * 问卷-答题提交对象
      */
      */
     private ApiAnswerSaveRequest apiAnswerSaveRequest;
     private ApiAnswerSaveRequest apiAnswerSaveRequest;