Merge branch 'master-fwq-积分抵扣现金' into master-test

fwq

2024-04-23 bdd39fac56c367b36d6c41ef2cd5c9f35926013f

 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;

}