Merge branch 'master' into master-test

wangrenhuang

2023-04-18 c302fa88eddece608db44bed2b6bb9de135c390e

 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;

}