Merge branch 'develop'

config/menu.php

@@ -2,7 +2,7 @@
 /**
  * Created by PhpStorm.
  * User: Administrator
- * Date: 2019-05-16
+ * Date: 2019-07-10
  * Time: 11:22
  */
 return [
@@ -24,6 +24,14 @@ return [
                 'name' => 'product',
                 'title' => '商品',
                 'children' => [
+                    [
+                        'name' =>'product-exchangeProduct',
+                        'title' => '兑换商品',
+                    ],
+                    [
+                        'name' =>'product-exchangeCode',
+                        'title' => '兑换码',
+                    ],
                     [
                         'name' => 'product-product',
                         'title' => '商品管理',