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

fwq

2023-08-23 b0f290df690b64c9d96458a7a5a5f836ed338689

 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;

}