Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/finance_statement_three

Application/Admin/Controller/CompanyGameRatioController.class.php

@@ -966,11 +966,11 @@ class CompanyGameRatioController extends AdminController
 
             $turnoverratio = json_decode($turnover_ratio[$key],true);
             $v['turnover_ratios'][$key] = array(
-                array("ratio"=>$value."%","name"=>"默认比例")
+                array("ratio"=>floatval($value)."%","name"=>"默认比例")
             );
 
             foreach($turnoverratio as $ke=>$va){
-                $t=array("ratio"=>$va["ratio"]."%");
+                $t=array("ratio"=>floatval($va["ratio"])."%");
                 if(array_key_exists("instanceof",$va)){
                     //存在
                     if($va['instanceof']=='1'){

Application/Admin/Controller/GameRatioMouldController.class.php

@@ -214,11 +214,11 @@ class GameRatioMouldController extends AdminController
     protected function readTurnoverRatio(&$v){
         $turnover_ratio = json_decode($v['turnover_ratio'],true);
         $v['turnover_ratio'] = array(
-            array("ratio"=>$v['ratio']."%","name"=>"默认比例")
+            array("ratio"=>floatval($v['ratio'])."%","name"=>"默认比例")
         );
         
         foreach($turnover_ratio as $ke=>$va){
-            $t=array("ratio"=>$va["ratio"]."%");
+            $t=array("ratio"=>floatval($va["ratio"])."%");
             if(array_key_exists("instanceof",$va)){
                 //存在
                 if($va['instanceof']=='1'){