fix conflect

Helius

2022-07-05 b95699652357c6218b45eceb81170ddfebb30e1d

 src/main/java/com/xcong/farmer/cms/modules/system/service/IUserService.java

@@ -28,4 +28,6 @@
    Result delObjs(AdminDeleteDto adminDeleteDto);

    Result updatePassword(AdminUpdatePasswordDto adminUpdatePasswordDto);

    Result userInfo();
}