Merge branch 'master' into master-test

ANDRU-PC\Andru

2023-08-29 0955de49844044ff1e7a44f423d2bdaecba6515a

 phis-feign/src/main/java/com/hz/his/dto/doctorTime/DoctorTimeDto.java

@@ -23,4 +23,10 @@
    Date endTime;
    Integer intervalTime;

    private String remark;
    private Integer timeType;
    private Integer isSpec;
    private String opEmpName;
    private String opEmpId;

}