Merge branch 'colonel' into 'test'

update:修改接口，返回的内容单位是分

See merge request bp/goods!34

application/services/marketing/MarketingService.php

@@ -173,7 +173,7 @@ class MarketingService
                 if($capitalPoolList[$val['capital_pool_id']]) {
                     $val['capital_pool'] = $capitalPoolList[$val['capital_pool_id']];
                     foreach (['capital_pool_total','capital_pool_lock','capital_pool_used'] as $key){
-                        $val['capital_pool'][$key] = sprintf("%0.02f",$val['capital_pool'][$key]);
+                        $val['capital_pool'][$key] = sprintf("%0.02f",$val['capital_pool'][$key]/100);
                     }
                     $poolTotal += $val['capital_pool']['capital_pool_total'];
                     $poolUsed += $val['capital_pool']['capital_pool_used'];