feat: 修复代码冲突

hjl

2024-06-06 c62e9f81b2072473b084abb30f7c005ed341a336

 ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java

@@ -44,6 +44,7 @@
    @Autowired
    private SysUserClient userClient;


    @PostMapping("login")
    public R<?> login(@RequestBody LoginBody form)
    {