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

fwq

2024-05-09 bceee99e4493c359e2c0872e4076d3db95718b71

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

@@ -15,6 +15,8 @@
    private Integer type;
    /**用户标识*/
    private String userId;
    /**门店标识*/
    private String shopId;
    /**点诊时间开始*/
    private Date startTime;
    /**点诊时间结束*/