Merge branch 'master' of http://git.qiniu1314.com/Kirin/shenying

route/api.php

@@ -381,6 +381,7 @@ Route::group('api', function () {
         Route::get('energy/bank', 'v1.user.UserExchangeController/bank')->name('exchangeEnergyBank');//能量值提取
         Route::post('energy/exchange', 'v1.user.UserExchangeController/exchange_energy')->name('exchangeEnergy');//能量值提取
         Route::post('energy/import', 'v1.user.UserExchangeController/brokerageToEnergy')->name('brokerageToEnergy');//能量值提取
+        Route::post('brokerage/trade', 'v1.user.UserBrokerageController/trade')->name('brokerageTrade');//能量值提取
 
 
         Route::post('extract/calculator', 'v1.user.UserExtractController/cash_calculator')->name('extractCalculator');//提现申请