Просмотр исходного кода

Merge branch 'master' into dev

shish 3 месяцев назад
Родитель
Сommit
60fda54c15
1 измененных файлов с 2 добавлено и 2 удалено
  1. 2 2
      app-ghs/controllers/ConsoleController.php

+ 2 - 2
app-ghs/controllers/ConsoleController.php

@@ -239,7 +239,7 @@ class ConsoleController extends BaseController
             ["name" => "盘点", "img" => "ghs/home/pandian.png", "url" => "/pagesStorehouse/inventory/list"],
             ["name" => "报损", "img" => "ghs/home/kcyjs.png", "url" => "/admin/breakage/list"],
             ["name" => "拆散", "img" => "ghs/home/kcyjs.png", "url" => "/admin/part/list"],
-            ["name" => "收款流水", "img" => "ghs/home/kcyjs.png", "url" => "/admin/order/scanPay"],
+            ["name" => "收款流水", "img" => "ghs/home/kcyjs.png", "url" => "/admin/order/scanPay"],
             ["name" => "收款码", "img" => "ghs/home/shop.png", "url" => "/admin/cg/code"]
         ];
         $menuIconMap = [
@@ -262,7 +262,7 @@ class ConsoleController extends BaseController
             '报损' => 'breakage',
             '损耗' => 'breakage',
             '拆散' => 'break_up',
-            '收款流水' => 'gather_record',
+            '收款流水' => 'gather_record',
             '收款流水' => 'gather_record',
             '收款码' => 'gather_code',
             '商城' => 'mall_code',