Merge pull request '修复汇总导出' (#391) from feature/more_payment into master

Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/391
4 years ago · 91701f3ecc
parent 82a40a79bd d6ea8057f0
commit 91701f3ecc
1 changed files with 1 additions and 1 deletions
--- a/Application/Admin/Controller/GameMarginController.class.php
+++ b/Application/Admin/Controller/GameMarginController.class.php
@ -200,7 +200,7 @@ class GameMarginController extends AdminController
                    $v["jh_margin_ratio"] = "=ROUND(Y{$line}/V{$line},3)";
                }
    
-                $v['margin_amount'] = "=ROUND((D{$line}-G{$line}-I{$line}-J{$line}-M{$line}-R{$line}-(V{$line}}-X{$line})),2)";
+                $v['margin_amount'] = "=ROUND((D{$line}-G{$line}-I{$line}-J{$line}-M{$line}-R{$line}-(V{$line}-X{$line})),2)";
                $v['margin_ratio'] = "=ROUND(AB{$line}/D{$line},3)";
                $v['count_year'] = $date['count_year'];
                $v['count_month'] = $date['count_month'];