diff --git a/admin/controllers/MenuController.php b/admin/controllers/MenuController.php
index be296a1..08387d3 100644
--- a/admin/controllers/MenuController.php
+++ b/admin/controllers/MenuController.php
@@ -29,7 +29,7 @@ class MenuController extends AuthController
 
         $menu2s = Menu::find()->where(['in','menuUrl',$AuthRule_path])->andWhere(['hidden'=>0])->orderBy(['sort'=>SORT_ASC])->asArray()->all();
 
-        return ArrayHelper::itemsMerge($menu2s,0,'menuUrl','parentPath','children');
+        return ArrayHelper::itemsMerge($menu2s,'','menuUrl','parentPath','children');
     }
     public function actionSave(){
         $menuUrl = $this->post('menuUrl');
diff --git a/admin/controllers/store/WareController.php b/admin/controllers/store/WareController.php
index 79fec92..9f20909 100644
--- a/admin/controllers/store/WareController.php
+++ b/admin/controllers/store/WareController.php
@@ -5,7 +5,7 @@ namespace admin\controllers\store;
 use admin\components\BaseAdminController;
 use admin\controllers\AuthController;
 use common\enums\UserRoleEnum;
-use common\jobs\ProductOrderAutoReceived;
+use common\jobs\ProductOrderAutoReceivedJob;
 use common\jobs\ProductOrderSendJob;
 use common\jobs\templateMessage\ProductOrderSend;
 use common\models\DrugStoreDrug;
@@ -503,7 +503,7 @@ class WareController extends BaseAdminController
             $ExpressNos->express_company_code = $post['express_company_code'];
             $ExpressNos->express_no = $post['express_no'];
             $ExpressNos->mobile = $post['mobile'];
-            $ExpressNos->state = $post['state'];
+            $ExpressNos->state = $post['state']?? 0;
             $ExpressNos->sync_at = null;
             $ExpressNos->created_at = date('Y-m-d H:i:s', time());
             $ExpressNos->updated_at = date('Y-m-d H:i:s', time());
@@ -537,7 +537,7 @@ class WareController extends BaseAdminController
             //订单自动收货- 发货7天后
             $config = \Yii::$app->params;
             $orderAutoReceivedTime = isset($config['product_order']['received_time']) ? $config['product_order']['received_time'] : 7*24*3600;
-            \Yii::$app->queue->delay($orderAutoReceivedTime)->push(new ProductOrderAutoReceived([
+            \Yii::$app->queue->delay($orderAutoReceivedTime)->push(new ProductOrderAutoReceivedJob([
                 'orderId' => $ProductOrder->id
             ]));
 
diff --git a/common/jobs/ProductOrderAutoReceivedJob.php b/common/jobs/ProductOrderAutoReceivedJob.php
index b0ca1dc..5565b76 100644
--- a/common/jobs/ProductOrderAutoReceivedJob.php
+++ b/common/jobs/ProductOrderAutoReceivedJob.php
@@ -11,7 +11,7 @@ use yii\queue\JobInterface;
 use yii\queue\Queue;
 
 //产品订单自动收货
-class ProductOrderAutoReceived extends BaseJob implements JobInterface
+class ProductOrderAutoReceivedJob extends BaseJob implements JobInterface
 {
     public $orderId;