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

fwq

2023-07-05 ba3d341a187b36ea5b9ed3266930d567c4774fcc

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