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

fwq

2024-05-13 f52dc5114638600e934cc82fe63c4a25f22594cc

 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;
}