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

admin/templates/default/refill.order.index.php

@@ -140,7 +140,7 @@
                     <td class="align-left"><?php echo $order['ch_trade_no']; ?></td>
                     <td class="align-center"><?php echo $order['channel_name']; ?></td>
                     <td class="w144 align-center">
-                        <a href="index.php?act=order&op=notify_merchant&order_id=<?php echo $order['order_id']; ?>">
+                        <a href="index.php?act=merchant&op=notify_merchant&order_id=<?php echo $order['order_id']; ?>">
                                 回调</a>
                     </td>