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

fwq

2022-12-06 7ee78c3fe1a81cad68c28b5572a8f6c36a75bdce

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

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

}