Merge branch 'master-base' into master-test

fhx

2024-08-02 bc798685f11aeec95e64c25b0a4594d8876d881d

 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;

}