Merge branch 'master-prod-new' into master-test

fwq

2024-05-24 b28a5cde3ddcb7ab1eda3b612014bdf2e717af5b

 phis-feign/src/main/java/com/hz/his/dto/sync/SyncUserCradDto.java

@@ -10,4 +10,7 @@

    /**his卡包id*/
    private String hisId;

    /**his 用户id*/
    private String userId;
}