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

* 'rcore' of 39.97.239.116:gyfl/xyzshop:
  dev

admin/templates/default/merchant.edit.php

@@ -46,7 +46,9 @@
             </tr>
 
             <tr>
-                <td colspan="2" class="required"><label for="credit_bonus">当前授信额度:<?php echo $output['merchant']['credit_bonus'];?></label></td>
+                <td colspan="2" class="required">
+                    <label for="credit_bonus">当前授信额度:<?php echo $output['merchant']['credit_bonus'];?></label>
+                </td>
             </tr>
             <tr class="noborder">
                 <td class="vatop">调整授信:
@@ -61,7 +63,9 @@
             </tr>
 
             <tr>
-                <td colspan="2" class="required"><label for="credit_bonus">当前剩余查询次数:<?php echo $output['merchant']['query_left_times'];?></label></td>
+                <td colspan="2" class="required">
+                    <label for="credit_bonus">当前剩余查询次数:<?php echo $output['merchant']['query_left_times'] . ' / ' . $output['merchant']['query_total_times']; ?></label>
+                </td>
             </tr>
             <tr class="noborder">
                 <td class="vatop">增加查询次数: