Merge branch 'feature/ip_forbit' of wmtx/platform into release

Application/Admin/Common/extend.php

@@ -1817,7 +1817,7 @@ function all_pay_way_other($type=false)
     $pay_way[1]=array('key'=>-1,'value'=>"绑币");
     $pay_way[2]=array('key'=>1,'value'=>"支付宝");
     $pay_way[3]=array('key'=>2,'value'=>"微信");
-    $pay_way[7]=array('key'=>7,'value'=>'金猪');
+    $pay_way[7]=array('key'=>7,'value'=>'苹果');
     $pay_way[9]=array('key'=>9,'value'=>"双乾支付-支付宝");
     $pay_way[10]=array('key'=>10,'value'=>"双乾支付-银联");
 //    $pay_way[3]=array('key'=>3,'value'=>'微信APP');