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

fhx

2024-06-05 570e48eb85b3958f56ade7e58a1ab9ef5a4957ed

 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;

}