Merge branch 'master-prod-new' into master-test

fwq

2023-11-10 05861c947332f646e713e1ffbb701cee0ca350d9

 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;

}