Merge remote-tracking branch 'origin/master' into master-test

fwq

2023-02-17 7b4da138fec5a10f36a4e8294e4d66a7631ab32b

 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;

}