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