From f8cc44e926fd22f9d1d864dc684c827f6960270b Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期五, 26 七月 2024 11:51:30 +0800
Subject: [PATCH] feat: 最新代码及配置
---
ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/service/impl/MasterWorkerServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/service/impl/MasterWorkerServiceImpl.java b/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/service/impl/MasterWorkerServiceImpl.java
index e01981d..ab93803 100644
--- a/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/service/impl/MasterWorkerServiceImpl.java
+++ b/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/service/impl/MasterWorkerServiceImpl.java
@@ -75,7 +75,7 @@
orderListVO.setUserId(userid);
orderListVO.setReservationName(order.getReservationName());
orderListVO.setReservationPhone(order.getReservationPhone());
- orderListVO.setReservationAddress(order.getReservationAddress());
+ orderListVO.setReservationAddress(order.getReservationAddress() + order.getAddress());
orderListVO.setTime(order.getTime());
orderListVO.setServerId(order.getServerId());
orderListVO.setServerName(order.getServerName());
@@ -152,7 +152,7 @@
orderListVO.setUserId(userid);
orderListVO.setReservationName(order.getReservationName());
orderListVO.setReservationPhone(order.getReservationPhone());
- orderListVO.setReservationAddress(order.getReservationAddress());
+ orderListVO.setReservationAddress(order.getReservationAddress() + order.getAddress());
orderListVO.setTime(order.getTime());
orderListVO.setServerId(order.getServerId());
orderListVO.setServerName(order.getServerName());
--
Gitblit v1.7.1