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

huliguo

1 天以前 a966dafb8877552267a94fe8c544c5ea72cf5650

 ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/service/LotteryEventClient.java

@@ -23,6 +23,6 @@
    * @param activityType
    * @return
    */
   @PostMapping("/mer/lotteryEvent/getLotteryEventList")
   @PostMapping("/lotteryEvent/getLotteryEventList")
   R<List<LotteryEvent>> getLotteryEventList(@RequestParam("activityType") Integer activityType);
}