Merge branch 'master' into master-test

wangrenhuang

2023-09-25 195af7b92b0aa5534cb28d25aa589f2d2545c7e9

 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;

}