Merge remote-tracking branch 'origin/master-rx-卡项促销活动分类' into master-jiayan...

rx

2024-08-26 c0a77acc892d89bf7dd4a04a19d85ba71c0dd57c

 phis-feign/src/main/java/com/hz/his/dto/user/card/UserCardDto.java

@@ -23,6 +23,11 @@
    private String effectiveStartTime;
    /**有效结束*/
    private String effectiveEndTime;
    /**是否SPA(0:否,1:是)*/
    private Integer isSpa;
    /**是否失效:0否1是,失效对应有效状态的4和5*/
    private Integer isInvalid;

}