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

wangrenhuang

2022-11-23 bba4dceccfb4d1c38b41ca3e7f9e6bc98f34d85f

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