merge

app/Admin/Controllers/PharmacyController.php

@@ -72,7 +72,8 @@ protected function grid()
             $grid->column('mobile');
             $grid->column('mobile');
             // $grid->column('lng');
             // $grid->column('lng');
             // $grid->column('lat');
             // $grid->column('lat');
-            // $grid->column('user.openid');
+            $grid->column('limit_buy_7', '1天限购');
+            $grid->column('user.openid');
             $grid->column('created_at');
             $grid->column('created_at');
             $grid->column('updated_at')->sortable();
             $grid->column('updated_at')->sortable();
 
 

app/Admin/Controllers/PharmacyDrugController.php

@@ -44,7 +44,7 @@ protected function grid()
             $grid->column('drug.dosage_form', '剂型');
             $grid->column('drug.dosage_form', '剂型');
             $grid->column('drug.factory', '生产厂家');
             $grid->column('drug.factory', '生产厂家');
             $grid->column('drug.approval_no', '批准文号');
             $grid->column('drug.approval_no', '批准文号');
-            $grid->column('drug.limit_buy_7', '7天限购');
+            $grid->column('drug.limit_buy_7', '1天限购');
             $grid->column('drug.standard_code', '本位码');
             $grid->column('drug.standard_code', '本位码');
             // $grid->column('dosage.dosage_desc', '用法用量');
             // $grid->column('dosage.dosage_desc', '用法用量');
             // $grid->column('batch_no');
             // $grid->column('batch_no');