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

frontend/controllers/MarketingStrategyController.php

@@ -582,6 +582,10 @@ class MarketingStrategyController extends UserBaseController
                 $ids[] = $item->id;
             }
         }
+        $result['flags'] = $flags;
+        $result['sql'] = ZhongjiTiaojian::find()
+            ->where('celuo_id=:celuo_id and type=1',[':celuo_id'=>$yingxiao_item->id])
+            ->andWhere(['<=','baofei', $total1_clear])->createCommand()->rawSql;
         if(count($ids) == 0) {
             return $result;
         }