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

wangrenhuang

2023-11-15 af486b86b33eaa1697b9d45801bfb86144e6c44a

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

 phis-feign/src/main/java/com/hz/his/dto/card/CardBagDto.java

@@ -14,6 +14,8 @@
    private String userId;
    /**卡包标识*/
    private String cardBagId;
    /**是否不查询取消的卡包:1不查看取消的卡包*/
    private Integer selectNoCancel;
    /**卡包有效状态*/
    private Integer effectiveStatus;
    /**操作员工标识*/

 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;


 phis-feign/src/main/java/com/hz/his/feign/service/platform/SVisitOrderService.java

@@ -10,7 +10,7 @@
/**
 * mot扫码到访
 */
@FeignClient(name="phi-platform-service",contextId = "phis-visit-order")
@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phis-visit-order")
public interface SVisitOrderService {
    /**
     * mot扫码到访