Merge branch 'master-zhangxu' into master-test

zhangxu

2022-12-08 23f822a32e39114dfcffd073c516ac3b39f03b16

 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;

}