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

chenjiahe

2023-08-22 a6eab70d0158d0d598225c0fec4ff96b27e84856

 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;

}