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

admin/templates/default/merchant.edit.php

@@ -73,6 +73,7 @@
                     <input name="oil_quality" <?php if($output['merchant']['oil_quality'] == 23){ echo 'checked';}?> value="23" type="radio">无流水+卡密
                     <input name="oil_quality" <?php if($output['merchant']['oil_quality'] == 24){ echo 'checked';}?> value="24" type="radio">有流水+无流水+卡密
                     <input name="oil_quality" <?php if($output['merchant']['oil_quality'] == 25){ echo 'checked';}?> value="25" type="radio">无流水+有流水+卡密
+                    <input name="oil_quality" <?php if($output['merchant']['oil_quality'] == 26){ echo 'checked';}?> value="26" type="radio">无流水+有流水+卡密+快充
                 </td>
             </tr>
             <tr>