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

zss

昨天 6ed4b397bb9dbb9c2d7bb0676339721fa97996bf

 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();