Merge branch 'master-xlk' into master-xlk-test

fhx

2024-08-23 1e65523fba19e99dbdf71d0a731a7747a2c9d4e0

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

@@ -33,4 +33,6 @@
    private List preOrderItems;
    //spa预约标识
    private String id;
    //SPU标识
    private String spuId;
}