修改userController冲突

Signed-off-by: ShiinaMinatus <xij1111@gmail.com>