合并分支 'li' 到 'master'

赠送积分和角色管理



查看合并请求 !596

@@ -120,7 +120,6 @@ class AdminIndexController extends AdminBaseController
                         'step' => ['neq', 1]
                         'step' => ['neq', 1]
                     ];
                     ];
                     $data = Db::name('zj_order')->where($map)->field('sum(whole) as whole,sum(whole_num) as whole_num')->select();
                     $data = Db::name('zj_order')->where($map)->field('sum(whole) as whole,sum(whole_num) as whole_num')->select();
-                    echo 1;
                 }
                 }
             }
             }
             $whole = $data[0]['whole'];
             $whole = $data[0]['whole'];