Merge branch 'master' into master-test

wangrenhuang

2023-04-18 cc35e61d33b2421344bb22eb1ba50d093eacb562

 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;

}