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

zxl

3 天以前 f3ccf81a4f203dd0d8957bab15c491cb2181e071

 buyer-api/src/main/java/cn/lili/controller/lmk/PrizeController.java

@@ -63,11 +63,11 @@
    /**
     * 增加抽奖次数
     *
     * @param prizeActivityId
     * @param addPrizeNumForm
     * @return
     */
    @PostMapping("/addPrizeNum/{prizeActivityId}")
    public Result addPrizeNum(@PathVariable String prizeActivityId, @RequestBody AddPrizeNumForm addPrizeNumForm) {
        return prizeService.grantRecord(prizeActivityId);
    @PostMapping("/addPrizeNum")
    public Result addPrizeNum( @RequestBody AddPrizeNumForm addPrizeNumForm) {
        return prizeService.addPrizeNum(addPrizeNumForm);
    }
}