From 983c8fc9697223956db395af1b781ddb75c6e0b5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 17 十月 2022 16:01:04 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OutController.java | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 0eda27d..d9617b6 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -8,7 +8,6 @@
import com.zy.asrs.service.*;
import com.zy.common.model.LocDto;
import com.zy.common.model.OrderDto;
-import com.zy.common.model.OrderMergeVo;
import com.zy.common.model.TaskDto;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -165,8 +164,7 @@
@RequestMapping(value = "/order/merge/preview/auth")
@ManagerAuth
public R mergePreview(@RequestParam(value = "orderIds[]") List<Long> orderIds){
- OrderMergeVo merge = orderService.mergePreview(orderIds);
- return R.ok().add(merge);
+ return R.ok().add(orderService.mergePreview(orderIds));
}
}
--
Gitblit v1.9.1