From 0d7d7d92329e46e8bede0f0ff18cac559a977154 Mon Sep 17 00:00:00 2001
From: zhouxiang <zhouxiang>
Date: 星期五, 09 十二月 2022 12:02:19 +0800
Subject: [PATCH] Merge branch '订单添加字段' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/order/CancelOrderDto.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/CancelOrderDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/CancelOrderDto.java
index 593fb6b..6b573f0 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/CancelOrderDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/CancelOrderDto.java
@@ -14,7 +14,16 @@
     /** 鎿嶄綔浜篿d 蹇呭~*/
     private String operatorId;
 
-    /** 骞冲彴鏉ユ簮   蹇呭~*/
+    /** 鎿嶄綔浜鸿鑹瞚d 蹇呭~*/
+    private String roleId;
+
+    /** 鏄惁闇�瑕佸鎵�  (0鍚� 1鏄�)   蹇呭~*/
+    private Integer isApproval;
+
+    /** 鏄惁鑷姩鐢熸垚閫�娆惧崟  (0鍚� 1鏄�)   蹇呭~*/
+    private Integer isRefund;
+
+    /** 骞冲彴鏉ユ簮  鍥犱负鏄痟is鍔╂墜鍙栨秷璁㈠崟鐨勮瘽灏辫鑷姩纭閫�娆惧崟  蹇呭~*/
     private Integer platformSource;
 
     /**his鍔╂墜*/

--
Gitblit v1.8.0