From 7bf9a808ea23b746b8d6c743e3560e3dd62b3b27 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期三, 15 十一月 2023 18:39:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
index a8b6967..210a568 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
@@ -24,6 +24,8 @@
     private List<PayAmountDto> amount;
     /**蹇呭~ 鎿嶄綔浜烘爣璇�,crm濉敤鎴�*/
     private String operatorId;
+    /** 鎿嶄綔浜鸿鑹�(鍗囧崟缁撹处蹇呭~锛岄��娆句娇鐢�) */
+    private String opRoleId;
 
     /**鏀粯鐢ㄦ埛*/
     private String payUserId;

--
Gitblit v1.8.0