From e3fe83d7676c8f954564a7fb90e82295b3da2fee Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 26 九月 2023 16:31:16 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/order/CancelOrderDto.java | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 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 5aaec20..18878c6 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
@@ -8,9 +8,33 @@
@Data
public class CancelOrderDto {
- /** 璁㈠崟id */
+ /** 璁㈠崟id 蹇呭～*/
private String orderId;
- /** 鎿嶄綔浜篿d */
+ /** 鎿嶄綔浜篿d 蹇呭～*/
private String operatorId;
+
+ /** 鎿嶄綔浜鸿鑹瞚d 蹇呭～*/
+ private String roleId;
+
+ /** 鏄惁闇�瑕佸鎵� (0鍚� 1鏄�) 蹇呭～*/
+ private Integer isApproval;
+
+ /** 鏄惁鑷姩鐢熸垚閫�娆惧崟 (0鍚� 1鏄�) 蹇呭～*/
+ private Integer isRefund;
+
+ /** 骞冲彴鏉ユ簮 鍥犱负鏄痟is鍔╂墜鍙栨秷璁㈠崟鐨勮瘽灏辫鑷姩纭閫�娆惧崟 蹇呭～*/
+ private Integer platformSource;
+
+ /** 鍙栨秷璁㈠崟澶囨敞 */
+ private String remarks;
+
+ /**his鍔╂墜*/
+ public static final Integer HIS_ASSISTANT = 0;
+ /**his鍚庡彴*/
+ public static final Integer HIS_BACKSTAGE = 1;
+ /**瀵煎尰*/
+ public static final Integer PHIS_GUIDE = 2;
+
+
}
--
Gitblit v1.8.0