Merge branch 'master-prod-new' into master-test

fhx

2023-08-29 4829593daa194b175e9e914634d352c7c4f0ffc6

 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;

}