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

wangrenhuang

2023-02-16 a3a2fe8909a84e177f3f8d183987eff4e391ea7b

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