ayHaru hace 4 años
padre
commit
888cceec1d

+ 0 - 1
admin/control/merchant.php

@@ -25,7 +25,6 @@ class merchantControl extends SystemControl
      */
     public function merchantOp()
     {
-        $this->successful_where();
         $model_merchant = Model('merchant');
 
         if (trim($_GET['merchant_name']) != '') {

+ 2 - 0
admin/templates/default/merchant.refill.evidence_list.php

@@ -68,6 +68,7 @@
                 <th class="align-center">申请日期</th>
                 <th class="align-center">审核日期</th>
                 <th class="align-center">审核管理员</th>
+                <th class="align-center">备注信息</th>
                 <th class="align-center"><?php echo $lang['operation']; ?></th>
             </tr>
             </thead>
@@ -115,6 +116,7 @@
                         <td class="nowarp align-center"><?php echo $v['add_time'] ? date('Y-m-d H:i', $v['add_time']) : $lang['no_limit']; ?></td>
                         <td class="nowarp align-center"><?php echo $v['check_time'] ? date('Y-m-d H:i', $v['check_time']) : $lang['no_limit']; ?></td>
                         <td class="nowarp align-center"><?php echo $v['admin_name']?></td>
+                        <td class="nowarp align-center"><?php echo $v['bz']?></td>
                         <td class="align-center w200">
                             <?php if($v['voucher_name'] != '/') {?>
                             <a target="_blank"