Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

chenjiahe

2023-08-07 9fd5c6f5473e692b2f15d182d07bb5cf278f57a5

 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;

}