Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang...

puzhibing

3 天以前 b7f2db358384ef1403850deb417ee767c916dc8e

Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0

# Conflicts:
#	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/Pop.java

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

@@ -82,7 +82,7 @@
            miniToken.put("lotteryDraw", true);
            miniToken.put("lotteryEventId", data.get(0).getId());
        }
        return R.ok();
        return R.ok(miniToken);
    }
    
    @DeleteMapping("logout")