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

wangrenhuang

2023-11-15 af486b86b33eaa1697b9d45801bfb86144e6c44a

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

@@ -25,6 +25,7 @@
    private String opShopId;
    private String opShopName;
    private String opRoleId;
    private String opRoleName;
    private String opRoleTypeId;
    private String opRoleStr;