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

admin/control/refill_successful.php

@@ -79,7 +79,8 @@ class refill_successfulControl extends SystemControl
                 $merchants[$value['mchid']] = $value;
             }
             foreach ($chnameData as $mchid) {
-                $mchname[$mchid] = $merchants[$mchid]['company_name'] == '' ? $merchants[$mchid]['name'] : $merchants[$mchid]['company_name'];
+                $merchant_name = $merchants[$mchid]['company_name'] == '' ? $merchants[$mchid]['name'] : $merchants[$mchid]['company_name'];
+                $mchname[$mchid] = "{$mchid}-{$merchant_name}";
             }
             $result['chname'] = $mchname;
         }