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

fwq

2023-07-12 d07e5cacbf0f3c1e1b5b42e115e1de574de55aea

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