Merge branch 'dev'

@@ -34,6 +34,7 @@ import com.yohoufo.order.model.response.PrepayResponse;
 import com.yohoufo.order.service.IPaymentService;
 import com.yohoufo.order.service.pay.alipay.AlipayOuyinService;
 import com.yohoufo.order.service.pay.weixin.WeixinPayUFOAppService;
+import com.yohoufo.order.service.pay.weixin.WeixinPayUFORealAppService;
 
 @RestController
 @RequestMapping(value = "/payment")
@@ -52,7 +53,7 @@ public class PaymentController {
     IPaymentService paymentService;
 
     @Autowired
-    WeixinPayUFOAppService weixinPayAppService;
+    WeixinPayUFORealAppService weixinPayAppService;
 
     @Autowired
     AlipayOuyinService alipayService;