From af486b86b33eaa1697b9d45801bfb86144e6c44a Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期三, 15 十一月 2023 12:11:05 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/user/room/UserDoctorRoomDto.java | 1 +
phis-feign/src/main/java/com/hz/his/dto/card/CardBagDto.java | 2 ++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SVisitOrderService.java | 2 +-
3 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/card/CardBagDto.java b/phis-feign/src/main/java/com/hz/his/dto/card/CardBagDto.java
index 585cc39..b882ebf 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/card/CardBagDto.java
+++ b/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;
/**鎿嶄綔鍛樺伐鏍囪瘑*/
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/room/UserDoctorRoomDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/room/UserDoctorRoomDto.java
index 0ec1c33..0f5443e 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/room/UserDoctorRoomDto.java
+++ b/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;
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SVisitOrderService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SVisitOrderService.java
index 651a917..5d65f3c 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SVisitOrderService.java
+++ b/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鎵爜鍒拌
--
Gitblit v1.8.0