Merge branch 'master-base' into master-test

fhx

2024-08-02 bc798685f11aeec95e64c25b0a4594d8876d881d

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

@@ -47,12 +47,16 @@
    /** 结束时间 */
    private String endTime;

    /** 敷麻时长(秒) */
    /** 沟通时长(分) */
    private Integer comDuration;
    /** 敷麻时长(分) */
    private Integer palsyDuration;
    /** 等待时长(秒) */
    /** 等待时长(分) */
    private Integer waitDuration;
    /** 实际面诊时长(秒) */
    /** 实际面诊时长(分) */
    private Integer realMzTime;

    /** 是否当天分隔上下午匹配(默认false) */
    private boolean isDaySpace = false;

}