Merge branch 'master-stander' into master-jiayan

fwq

12 小时以前 2bbf2a6d0b13772aa5254cb9e9271bd2e41d4061

 phis-feign/src/main/java/com/hz/his/dto/user/room/UserDoctorRoomItemDto.java

@@ -27,4 +27,9 @@
    private String nurseId;
    /**护士名称*/
    private String nurseName;

    /**旧医生*/
    private String oldDoctorId;
    /**旧医生名称*/
    private String oldDoctorName;
}