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

admin/control/refill_successful.php

@@ -82,6 +82,7 @@ class refill_successfulControl extends SystemControl
                 $merchant_name = $merchants[$mchid]['company_name'] == '' ? $merchants[$mchid]['name'] : $merchants[$mchid]['company_name'];
                 $mchname[$mchid] = "{$mchid}-{$merchant_name}";
             }
+            sort($mchname);
             $result['chname'] = $mchname;
         }
         $amountData = array_unique($amount);