Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

fhx

2023-09-26 ab2a6f7e77b504a82de22dc2b8dd987564ed77f5

 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;

}