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

src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java

@@ -246,7 +246,7 @@ public class DiscSpinningController {
     @RequestMapping("/app/discSpinning/receive")
     @Login
     public Result receive(@RequestAttribute("userId") Long userId) {
-        userService.addBlackUser(userId, "转盘奖项领取");
+//        userService.addBlackUser(userId, "转盘奖项领取");
         return Result.success().put("data", 1);
     }