#

luxiaotao1123

2022-10-17 983c8fc9697223956db395af1b781ddb75c6e0b5

 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));
    }

}