Merge branch 'master-zhangxu' into master-test

zhangxu

2022-12-20 5c565f444b2575024f947eca6f45d478405860d0

 phis-feign/src/main/java/com/hz/his/dto/user/UserUnionDto.java

@@ -45,4 +45,6 @@
     */
    private String corpUserId;

    private String id;

}