Merge branch 'master-prod-new' into master-test

fwq

2024-02-29 41cd83bda10e3d21bf8e3812b5be931da8bc6f3a

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