Merge branch 'master' into master-test

wangrenhuang

2023-03-23 fcf8b677cf0a8165da424b642a9ade51aa91e7e9

 phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java

@@ -69,8 +69,7 @@
    private String email;
    /**头像*/
    private String imgUrl;

    private String hisId;
    private String userBelongingType;

    private String hisId;
}