Merge remote-tracking branch 'origin/develop' into develop

6 years ago · fe7c194c81
parent fdea0b3d8d 0769799a01
commit fe7c194c81
1 changed files with 1 additions and 1 deletions
--- a/src/main/java/au/com/royalpay/payment/manage/customers/web/EncourageMoneyController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/customers/web/EncourageMoneyController.java
@ -27,7 +27,7 @@ public class EncourageMoneyController {
    @Resource
    private EncourageService encourageService;

-    @RequestMapping(value = "/orders/{orderId}", method = RequestMethod.GET)
+    @RequestMapping(value = "/orders/{orderId}", method = RequestMethod.PUT)
    public JSONObject takeEncourageMoney(@PathVariable String orderId,@ModelAttribute(CommonConsts.WECHATINFO) JSONObject wxUser,@ModelAttribute(CommonConsts.ALIUSER) JSONObject aliuser) {
        String user_id = "";
        if(wxUser==null){