Merge remote-tracking branch 'origin/dev_zxm' into test

yd-csf-feign/src/main/java/com/yd/csf/feign/response/appointment/ApiAppointmentPageResponse.java

@@ -12,6 +12,11 @@ import java.time.LocalDateTime;
 public class ApiAppointmentPageResponse {
 public class ApiAppointmentPageResponse {
 
 
     /**
     /**
+     * 预约信息主表唯一业务ID
+     */
+    private String appointmentBizId;
+
+    /**
      * 预约编号
      * 预约编号
      */
      */
     private String appointmentNo;
     private String appointmentNo;

yd-csf-service/src/main/resources/mappers/AppointmentMapper.xml

@@ -4,6 +4,7 @@
 
 
     <select id="page" resultType="com.yd.csf.feign.response.appointment.ApiAppointmentPageResponse">
     <select id="page" resultType="com.yd.csf.feign.response.appointment.ApiAppointmentPageResponse">
         select
         select
+        a.appointment_biz_id,
         a.appointment_no,
         a.appointment_no,
         concat(pp.product_name,'（',pp.payment_term,'年）') as productName,
         concat(pp.product_name,'（',pp.payment_term,'年）') as productName,
         concat(pp.company_name, '\n', pp.region) as companyName,
         concat(pp.company_name, '\n', pp.region) as companyName,