Merge remote-tracking branch 'origin/dev_New' into dev_New

liyong

9 天以前 0e3b66ffaf4d601a2c5560bdd61a0121bea7696c

 src/main/java/com/ruoyi/project/system/controller/SysLoginController.java

@@ -73,7 +73,7 @@
     * 

     * @return 用户信息

     */

    @GetMapping("getInfo")

    @GetMapping("/getInfo")

    public AjaxResult getInfo()

    {

        LoginUser loginUser = SecurityUtils.getLoginUser();