调整冲突

app/Admin/Controllers/Activity/CouponController.php

@@ -24,11 +24,6 @@ class CouponController extends AdminController
             $filter->column(1 / 2, function ($filter) {
                 $filter->equal('status', '状态')->select(ActivityCoupon::STATUS);
                 $filter->between('used_at', '核销时间')->datetime();
-<<<<<<< HEAD
-=======
-
-
->>>>>>> a7719d7038809738262e66c70e301947845f680d
                 $filter->where(function ($query) {
                     $query->whereHas('outlet', function ($query) {
                         $query->whereHas('info', function ($query) {
@@ -57,11 +52,6 @@ class CouponController extends AdminController
                     })
                     ->get()
                     ->pluck('nickname', 'id');
-<<<<<<< HEAD
-
-=======
-                
->>>>>>> a7719d7038809738262e66c70e301947845f680d
                 $filter->where(function ($query) {
                     $query->whereHas('outlet', function ($query) {
                         $query->whereHas('parent', function ($query) {

app/Admin/Controllers/Activity/IndexController.php

@@ -55,27 +55,6 @@ class IndexController extends AdminController
                 Activity::CHANNEL_YSD   => 'info',
                 Activity::CHANNEL_UNION => 'success',
             ]);
-<<<<<<< HEAD
-
-        $grid->column('days', '延期(天)');
-        $grid->column('rule.full', '满足金额');
-        $grid->column('rule.take', '扣除金额');
-        $grid->column('发券渠道')
-            ->display(function () {
-                return $this->grants->pluck('user_nickname');
-            })
-            ->label()
-            ->width(350)
-            ->hide();
-
-        $grid->column('核券渠道')
-            ->display(function () {
-                return $this->verifications->pluck('user_nickname');
-            })
-            ->label()
-            ->width(350)
-            ->hide();
-=======
         $grid->column('days', '延期(天)');
         $grid->column('rule.full', '满足金额');
         $grid->column('rule.take', '扣除金额');
@@ -85,7 +64,6 @@ class IndexController extends AdminController
         $grid->column('核券渠道')->display(function ($title, $column) {
             return '查看';
         })->modal(Verifications::class);
->>>>>>> a7719d7038809738262e66c70e301947845f680d
 
         $grid->column('开始时间')->display(function () {
             return $this->type == Activity::TYPE_SCOPE ? $this->start_at->format('Y-m-d') : '---';
@@ -135,10 +113,7 @@ class IndexController extends AdminController
             ->when(Activity::TYPE_SCOPE, function (Form $form) {
                 $form->dateRange('start_at', 'end_at', '有效时间');
             })
-<<<<<<< HEAD
             ->help('当月券，领取的月底到期')
-=======
->>>>>>> a7719d7038809738262e66c70e301947845f680d
             ->required();
 
         $form->radio('channel', '核销途径')
@@ -146,11 +121,7 @@ class IndexController extends AdminController
             ->default(Activity::CHANNEL_YSD)
             ->help('券码核销的途径：亿时代是自己核销，银联是银联pos核销')
             ->required();
-<<<<<<< HEAD
-
-        $form->number('day_times','每天可用次数')->default(0)->help('每天可用次数，0未不限制');
-=======
->>>>>>> a7719d7038809738262e66c70e301947845f680d
+        $form->number('day_times', '每天可用次数')->default(0)->help('每天可用次数，0未不限制');
 
         $form->switch('status', '状态')->default(1);
         $form->switch('need_check', '多次校验')