Merge branch 'fhx-base-预约整合0808' into master-xlk-test

fhx

2024-08-27 3b2d2bbcc05c0af257dfd06260fb0e91169822b2

Merge branch 'fhx-base-预约整合0808' into master-xlk-test

 phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentV2Dto.java

@@ -73,6 +73,8 @@
    private String remark;
    /** 餐食备注 */
    private String mealsRemark;
    /** 预约冲突原因 */
    private String conflictReason;

    /** 预约项目json字符串 */
    private String projectJson;