Merge branch 'master' into master-test

wangrenhuang

2023-07-05 334bb53b5f7881cbd6d587e03ecf032324142e2a

 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;

}