Merge branch 'version1.5' into dev_wf

app/admin/controller/Sale.php

@@ -3647,7 +3647,7 @@ class Sale extends Base
                 $good_data[] = ['good_log_code' => $outCode, "stock_id" => $stokc['id'], "type" => 2, 'stock' => $outinfo['send_num'], "stock_name" => "wait_out_stock"];
 
                 GoodLog::LogAdd(['id' => $uid, 'nickname' => $uname], $good_data, "CKD");
-                Cache::store("redis")->handler()->lPush("SENDOUT", $outCode, 1800);
+                Cache::store("redis")->handler()->lPush("SENDOUT", $outCode);
 
                 Db::commit();
 
@@ -4292,7 +4292,7 @@ class Sale extends Base
 
 
                 } else throw new Exception($value['outCode'] . '发货失败');
-                Cache::store("redis")->handler()->lPush("SENDOUT",$value['outCode'],1800);
+                Cache::store("redis")->handler()->lPush("SENDOUT",$value['outCode']);
             }
 
             if (!empty($good_data)) GoodLog::LogAdd(['id' => $createrid, 'nickname' => $creater], $good_data, "CKD");