Merge branch 'master-tiande' into dev-tiande

a1841513 · hezhen · 88c05177 · a157600e · a1841513
Commit a1841513 authored Jan 05, 2021 by hezhen
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

OrderActivityInfoController.java ...xxfc/platform/order/rest/OrderActivityInfoController.java +2 -2

No files found.
--- a/xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderActivityInfoController.java
+++ b/xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderActivityInfoController.java
@@ -61,8 +61,8 @@ public class OrderActivityInfoController extends BaseController<OrderActivityInf
    }
-    @GetMapping("export")
+    @PostMapping("export")
-    public void exportMemberOrders(ActivityOrderFindDTO memberOrderFindDTO, HttpServletResponse response){
+    public void exportMemberOrders(@RequestBody ActivityOrderFindDTO memberOrderFindDTO, HttpServletResponse response){
        try {
            String name = DateTimeFormatter.ofPattern("YYYYMMddHHmmss").format(LocalDateTime.now());
            response.setContentType("application/vnd.ms-excel;charset=utf-8");