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

fhx

2023-11-02 c744b64955f5724a2112dcf8bcd7498626037fe9

 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;

}