Merge remote-tracking branch 'origin/master'

# Conflicts:
#	jsjp-admin/src/main/java/com/miaxis/pc/PcOrderInfoController.java

jsjp-admin/src/main/java/com/miaxis/pc/PcOrderInfoController.java

@@ -88,12 +88,11 @@ public class PcOrderInfoController extends BaseController{
     @ApiOperation("发起退款")
     public Response<OrderInfo> refund(
             @ApiParam(name = "outTradeNo", value = "订单信息参数", required = true)
-            @PathVariable("outTradeNo") String outTradeNo,
-            @PathVariable("failCause") String failCause
+            @PathVariable("outTradeNo") String outTradeNo
     ) throws Exception {
         String refundCode = getOrderCode(null);
         WxJsOrder order = wxJsOrderService.getByOutTradeNo(outTradeNo);
-        refundRecordService.refund(order,refundCode,failCause);
+        refundRecordService.refund(order,refundCode,"极速驾培退款");
         //TODO 取消会员
         orderInfoService.refundOrder(order);