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

Pu Zhibing

13 小时以前 2cf783a1480050c0f13907c5fde625edee8fce62

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventServiceImpl.java

@@ -404,7 +404,7 @@
      List<MgtLotteryEventPageVo> voList = this.baseMapper.pageMgtLotteryEvent(dto);
      //填充创建对象
      voList.forEach(x->{
         if (x.getActivityType()!=6){
         if (null == x.getShopId()){
            x.setCreateObject("平台创建");
         }else {
            //线下抽奖，获取门店名称