Merge branch 'coupon_rebate' of http://120.24.33.109:11081/hyzjshwo/lanzu_api_hyperf into coupon_rebate

# Conflicts:
#	config/routes.php

app/Controller/CouponRebateController.php

@@ -50,7 +50,7 @@ class CouponRebateController extends BaseController
     /**
      * 用户领取优惠券
     */
-    public function userReceiveCouponA(CouponRebateReceiveRequest $validator)
+    public function userReceiveCoupon(CouponRebateReceiveRequest $validator)
     {
         $userId      = $this->request->input("user_id", 0);
         $receiveType = $this->request->input("receive_type", 0);

config/routes.php

@@ -27,6 +27,6 @@ Router::addGroup('/v1/',function (){
     Router::post('ParamsToken/analyze', 'App\Controller\ParamsTokenController@analyze');
     Router::post('Ad/banners', 'App\Controller\AdController@banners');
     Router::post('CouponRebate/isCouponRebate', 'App\Controller\CouponRebateController@isCouponRebate');
-    Router::post('CouponRebate/userReceiveCoupon', 'App\Controller\CouponRebateController@userReceiveCouponA');
+    Router::post('CouponRebate/userReceiveCoupon', 'App\Controller\CouponRebateController@userReceiveCoupon');
     Router::post('CouponRebate/getActiveInfo', 'App\Controller\CouponRebateController@getActiveInfo');
 });