diff --git a/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php b/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php
index a9e09c936..50d5bc990 100644
--- a/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php
+++ b/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php
@@ -32,7 +32,7 @@ class StoreFinanceFlowLists extends BaseAdminDataLists implements ListsSearchInt
     public function setSearch(): array
     {
         return [
-            '=' => ['store_id', 'user_id', 'create_time', 'staff_id','financial_type','financial_pm','order_id'],
+            '=' => ['store_id', 'user_id', 'create_time', 'staff_id','financial_type','financial_pm','order_id','order_sn'],
             'between_time' => 'create_time',
             '%pipe_like%' => ['keyword' => 'order_sn'],
         ];
diff --git a/app/admin/lists/warehouse_product/WarehouseProductLists.php b/app/admin/lists/warehouse_product/WarehouseProductLists.php
index 5ca083b90..8dbdc1178 100644
--- a/app/admin/lists/warehouse_product/WarehouseProductLists.php
+++ b/app/admin/lists/warehouse_product/WarehouseProductLists.php
@@ -11,6 +11,7 @@ use app\common\model\store_product\StoreProduct;
 use app\common\model\system_store\SystemStore;
 use app\common\model\warehouse\Warehouse;
 use app\common\lists\ListsExcelInterface;
+use app\common\model\store_product_unit\StoreProductUnit;
 use app\common\model\supplier\Supplier;
 
 /**
@@ -78,6 +79,8 @@ class WarehouseProductLists extends BaseAdminDataLists implements ListsSearchInt
                 $item->store_name = '';
                 $item->image = '';
                 $item->price = '';
+                $item->unit_name = '';
+                $item->store_info = '';
                 if ($item->financial_pm == 0) {
                     $item->financial_pm_name = '出库';
                 } else {
@@ -101,11 +104,13 @@ class WarehouseProductLists extends BaseAdminDataLists implements ListsSearchInt
                     $item->admin_name = '';
                 }
                 if ($item->product_id) {
-                    $find = StoreProduct::where('id', $item->product_id)->field('price,image,store_name')->find();
+                    $find = StoreProduct::where('id', $item->product_id)->field('price,image,store_name,unit,store_info')->find();
                     if($find){
                         $item->store_name = $find->store_name . '|' . $item->product_id;
                         $item->image = $find->image;
                         $item->price = $find->price;
+                        $item->unit_name = StoreProductUnit::where('id', $find->unit)->value('name');
+                        $item->store_info =$find->store_info;
                     }
                 }
                 if ($item->warehouse_id) {
@@ -182,12 +187,17 @@ class WarehouseProductLists extends BaseAdminDataLists implements ListsSearchInt
             ];
         } else {
             $data = [
+                'id' => 'id',
                 'admin_name' => '操作人员',
                 'warehouse_name' => '仓库',
                 'store_name' => '商品名称',
+                'store_info' => '规格',
+                'unit_name' => '单位',
                 'financial_pm_name' => '出入库',
                 'system_store_name' => '门店',
                 'nums' => '数量',
+                'purchase' => '价格',
+                'total_price' => '总价',
                 'create_time' => '操作时间',
             ];
         }
diff --git a/app/admin/logic/beforehand_order/BeforehandOrderLogic.php b/app/admin/logic/beforehand_order/BeforehandOrderLogic.php
index 7856e3ce0..95e51f64b 100644
--- a/app/admin/logic/beforehand_order/BeforehandOrderLogic.php
+++ b/app/admin/logic/beforehand_order/BeforehandOrderLogic.php
@@ -59,6 +59,7 @@ class BeforehandOrderLogic extends BaseLogic
                     unset($params['product_arr'][$k]);
                     continue;
                 }
+                $datas[$k]['purchase'] = $v['purchase'];
                 $datas[$k]['mark'] = $v['mark'] ?? '';
                 $datas[$k]['product_id'] = $v['product_id'];
                 $datas[$k]['uid'] = $uid;
@@ -70,7 +71,7 @@ class BeforehandOrderLogic extends BaseLogic
                 $datas[$k]['gross_weight'] = $v['gross_weight'];
                 $datas[$k]['net_weight'] = $v['net_weight'];
                 $datas[$k]['cart_num'] = $v['nums'];
-                $datas[$k]['price'] = $v['purchase'];
+                $datas[$k]['price'] = $v['price'];
                 $datas[$k]['package'] = $v['package'];
                 $datas[$k]['total_price'] = $v['total_price'];
                 $datas[$k]['create_time'] = time();
@@ -360,7 +361,7 @@ class BeforehandOrderLogic extends BaseLogic
                     'admin_id' => $admin_id,
                     'total_price' => $arr['total_price'],
                     'price' => $arr['price'],
-                    'purchase' => $arr['price'],
+                    'purchase' => $arr['purchase'],
                     'oid' => $res['id'],
                     'code' => $res['code'],
                 ];
diff --git a/app/common/model/OperationLog.php b/app/common/model/OperationLog.php
index 2cfe5164e..fd72f6001 100644
--- a/app/common/model/OperationLog.php
+++ b/app/common/model/OperationLog.php
@@ -6,4 +6,6 @@ namespace app\common\model;
 
 class OperationLog extends BaseModel
 {
+    protected $json = ['params'];
+
 }
\ No newline at end of file
diff --git a/public/apidoc-ui.zip b/public/apidoc-ui.zip
deleted file mode 100644
index 3032a96f3..000000000
Binary files a/public/apidoc-ui.zip and /dev/null differ