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

app/AdminAgent/Controllers/DemandBiddingController.php

@@ -50,6 +50,7 @@ class DemandBiddingController extends AdminController
 			$grid->disableViewButton();
 			$grid->disableCreateButton();
 			$grid->disableActions();
+			$grid->disableRowSelector();
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->equal('id');
 

app/AdminAgent/Controllers/DemandController.php

@@ -93,6 +93,7 @@ class DemandController extends AdminController
 			$grid->disableEditButton();
 			$grid->disableQuickEditButton();
 			$grid->disableViewButton();
+			$grid->disableRowSelector();
 			//$grid->disableActions();
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->equal('id');

app/AdminAgent/Controllers/MyBiddingProductController.php

@@ -52,6 +52,7 @@ class MyBiddingProductController extends AdminController
 			$grid->disableViewButton();
 			$grid->disableActions();
 			$grid->disableCreateButton();
+			$grid->disableRowSelector();
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->equal('id');
 				$filter->equal('bidding_user_type','竞标用户类型')->select(DemandTraits::$polymorphic);

app/AdminAgent/Controllers/MyDemandProductController.php

@@ -62,6 +62,7 @@ class MyDemandProductController extends AdminController
 			$grid->disableViewButton();
 			$grid->disableActions();
 			$grid->disableCreateButton();
+			$grid->disableRowSelector();
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->equal('id');
 				$filter->equal('bidding_user_type','竞标用户类型')->select(DemandTraits::$polymorphic);

app/AdminGuide/Controllers/DemandBiddingController.php

@@ -50,6 +50,7 @@ class DemandBiddingController extends AdminController
 			$grid->disableViewButton();
 			$grid->disableCreateButton();
 			$grid->disableActions();
+			$grid->disableRowSelector();
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->equal('id');
 

app/AdminGuide/Controllers/DemandController.php

@@ -92,6 +92,7 @@ class DemandController extends AdminController
 			$grid->disableEditButton();
 			$grid->disableQuickEditButton();
 			$grid->disableViewButton();
+			$grid->disableRowSelector();
 			//$grid->disableActions();
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->equal('id');

app/AdminGuide/Controllers/MyDemandProductController.php

@@ -70,6 +70,7 @@ class MyDemandProductController extends AdminController
 			$grid->disableViewButton();
 			$grid->disableActions();
 			$grid->disableCreateButton();
+			$grid->disableRowSelector();
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->equal('id');
 				$filter->equal('bidding_user_type','竞标用户类型')->select(DemandTraits::$polymorphic);

app/AdminSupplier/Controllers/DemandBiddingController.php

@@ -69,6 +69,7 @@ class DemandBiddingController extends AdminController
 			$grid->disableViewButton();
 			$grid->disableCreateButton();
 			$grid->disableActions();
+			$grid->disableRowSelector();
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->equal('id');
 

app/AdminSupplier/Controllers/DemandController.php

@@ -83,6 +83,7 @@ class DemandController extends AdminController
 			$grid->disableViewButton();
 			$grid->disableCreateButton();
 			$grid->disableActions();
+			$grid->disableRowSelector();
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->equal('id');
 				$filter->equal('bidding_user_type','竞标用户类型')->select(DemandTraits::$polymorphic);

app/AdminSupplier/Controllers/DemandProductController.php

@@ -38,7 +38,7 @@ class DemandProductController extends AdminController
 			$grid->column('status')->using(ProductStatus::array());
 			$grid->column('created_at');
 			$grid->column('updated_at');
-
+			$grid->disableRowSelector();
 			$grid->filter(function (Grid\Filter $filter) {
 				$filter->equal('id');
 

app/AdminSupplier/Controllers/MyBiddingProductController.php

@@ -53,6 +53,7 @@ class MyBiddingProductController extends AdminController
 			$grid->disableViewButton();
 			$grid->disableActions();
 			$grid->disableCreateButton();
+			$grid->disableRowSelector();
 			$grid->filter(function (Grid\Filter $filter) {
 				$filter->equal('id');
 				$filter->equal('bidding_user_type','竞标用户类型')->select(DemandTraits::$polymorphic);

resources/lang/zh_CN/global.php

@@ -34,6 +34,7 @@ return [
 		'demand_bidding'=> '我的竞标',
 		'my_bidding_product' => '竞标产品库',
 		'demand_product'=> '产品管理',
+		'MyBiddingProduct' => '竞标产品库',
     ],
     'options' => [
         //