Merge branch 'rgroup' of 39.97.239.116:gyfl/xyzshop into rgroup

helper/refill/policy/mgroup.php

@@ -109,7 +109,7 @@ class rgroup_ctl
 
     private function load_merchant($groups)
     {
-        $mchitems = []; //读取数据库，获取机构列表
+        $mchitems = Model('')->table('merchant')->limit(1000)->select();//读取数据库，获取机构列表
         foreach ($mchitems as $item)
         {
             $mchid = intval($item['mchid']);