From 37993b3cf3243e6ffdacab526b04dd2284565a42 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 25 七月 2024 18:59:31 +0800
Subject: [PATCH] Merge branch 'master-base' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/dto/order/CancelOrderDto.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 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 6b573f0..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
@@ -26,11 +26,15 @@
     /** 骞冲彴鏉ユ簮  鍥犱负鏄痟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