Merge branch 'master' of ssh://git.dever.cc:10022/dever-product/churen

service/agent/database/member.php

@@ -870,7 +870,7 @@ return array
                 'state' => 1,
             ),
             'type' => 'all',
-            'col' => 'id,sell',
+            'col' => 'id,group_sell',
         ),
 
         'getDataByArea' => array

service/agent/lib/Member.php

@@ -672,8 +672,8 @@ class Member
         $temp = array();
         $sell = 0;
         foreach ($info as $key => $val) {
-            $temp[] = $val['sell']; // 用一个空数组来承接字段
-            $sell += $val['sell'];
+            $temp[] = $val['group_sell']; // 用一个空数组来承接字段
+            $sell += $val['group_sell'];
         }
         if($temp){
              $total = $sell - max($temp);