Merge branch 'hotfix/payment_merch_bug' of wmtx/platform into release

修改文字

Application/Admin/View/PaymentMerchant/ruleAddForm.html

@@ -140,7 +140,7 @@
               <td class="l"><i class="mustmark">*</i>游戏：</td>
               <td class="r">
                 <select name="game_id" id="game-select" class="select_gallery" multiple="multiple" style="width: 500px;">
-                  <option value="0">所有择游戏</option>
+                  <option value="0">所有游戏</option>
                   <?php foreach($games as $game):?>
                   <option value="<?=$game['id']?>"><?=$game['name']?></option>
                   <?php endforeach;?>

Application/Admin/View/PaymentMerchant/ruleEditForm.html

@@ -140,7 +140,7 @@
               <td class="l"><i class="mustmark">*</i>游戏：</td>
               <td class="r">
                 <select name="game_id" id="game-select" class="select_gallery" style="width: 500px;" disabled>
-                  <option value="0">所有择游戏</option>
+                  <option value="0">所有游戏</option>
                   <?php foreach($games as $game):?>
                   <option value="<?=$game['id']?>" <?php if($record['game_id']==$game['id']):?>selected<?php endif;?>><?=$game['name']?></option>
                   <?php endforeach;?>