Merge branch 'coupon_report' into develop

# Conflicts:
#	app/Admin/routes.php

app/Admin/routes.php

@@ -28,13 +28,13 @@ Route::group([
     $router->any('/api/getMpInfo', 'ImsCjdcMarketController@getMpInfo');
 
     $router->get('/coupon/TieForm', 'CouponTieController@CouponTieForm');
-
     $router->get('/couponTie', 'CouponTieController@CouponTieList');
+    $router->get('/couponSetting', 'couponSetting@grid');
 
-    //鑾峰彇鎵€鏈夊競鍦�
+    //获取所有市场
     $router->any('/api/getAllMarket', 'LanzuServiceSpeakerController@getAllMarkets');
 
-    //鏍规嵁甯傚満id锛屽晢鎴峰悕鏌ヨ�鍟嗘埛
+    //根据市场id，商户名查询商户
     $router->any('/api/stores', 'LanzuServiceSpeakerController@getStores');
 
 });