Merge branch 'test6.9.7' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.7

@@ -615,6 +615,7 @@ public class MerchantOrderPaymentService extends AbstractOrderPaymentService {
 				}
 				result.put("info", SellerWalletDetail.Type.of(sw.getType()).getName());
 				result.put("time", sdf.format(new Date(1000L * detail.getCreateTime())));
+                result.put("order_code", detail.getOrderCode());
 				array.add(result);
 			}
 			return new com.yohoufo.common.ApiResponse(200, "查询成功", pageResp);