From 3331e358f12dd29b15eb94e6f57d0d11ccd8182c Mon Sep 17 00:00:00 2001
From: zhangxu <3%usVi4iXbVkhI1c>
Date: 星期五, 23 九月 2022 10:06:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserAppointmentDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserAppointmentDto.java
index b34de36..e11e2e7 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/UserAppointmentDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserAppointmentDto.java
@@ -10,5 +10,7 @@
     private String userId;
    /**鐘舵��:1宸插畬鎴�*/
    private Integer isArrive;
+   /**鍙栨秷鐘舵�侊細0鏃狅紝1鐢宠涓紝2鍙栨秷鎴愬姛锛�3鍙栨秷澶辫触*/
+   private Integer cancelStatus;
 
 }

--
Gitblit v1.8.0