From 02e99e878911715d2785e371ae6fb576597578b0 Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期五, 09 八月 2024 09:34:49 +0800 Subject: [PATCH] 8.9 --- ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/OrderController.java | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/OrderController.java b/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/OrderController.java index 1e3a350..bc66975 100644 --- a/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/OrderController.java +++ b/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/OrderController.java @@ -18,7 +18,7 @@ import com.ruoyi.system.api.model.LoginUserInfo; import com.ruoyi.worker.entity.MasterWorker; import com.ruoyi.worker.entity.RecoveryServe; -import com.ruoyi.worker.entity.ServeCoordinate; +import com.ruoyi.worker.vo.ServeCoordinate; import com.ruoyi.worker.service.MasterWorkerService; import com.ruoyi.worker.service.RecoveryServeService; import io.swagger.annotations.Api; @@ -97,6 +97,9 @@ mw -> Optional.ofNullable(mw.getCover()).orElse(""))); for (Order order : orderList) { order.setCover(map.get(order.getServeId())); + if (order.getAddress()!=null) { + order.setReservationAddress(order.getReservationAddress() + order.getAddress()); + } } } return R.ok(dataList); -- Gitblit v1.7.1