Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

fwq

2024-05-17 77318cea0ffa3a0ac2402e3dea3077f48cef2dea

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