From e3f2fe16924ba4d5f716db56d7c3c0822b7fb0e9 Mon Sep 17 00:00:00 2001 From: cjw Date: Mon, 23 Sep 2024 15:00:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/scale/controller/wx/WxOrderController.java | 4 ++-- .../org/dromara/scale/domain/vo/ReservationOrderVo.java | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxOrderController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxOrderController.java index 3211b25..42ca3e2 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxOrderController.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxOrderController.java @@ -83,7 +83,7 @@ public class WxOrderController extends BaseController { } /** - * 查询量表订单列表 + * 查询用户预约订单列表 */ @GetMapping("/user/reservation/pageList") public TableDataInfo userReservationOrderList(ReservationOrderBo bo, PageQuery pageQuery) { @@ -94,7 +94,7 @@ public class WxOrderController extends BaseController { } /** - * 查询量表订单列表 + * 查询咨询师预约订单列表 */ @GetMapping("/counselor/reservation/pageList") public TableDataInfo counselorReservationOrderList(ReservationOrderBo bo, PageQuery pageQuery) { diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationOrderVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationOrderVo.java index bfcda52..ccf672b 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationOrderVo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationOrderVo.java @@ -81,4 +81,10 @@ public class ReservationOrderVo implements Serializable { private Date createTime; + private Long createBy; + + @Translation(type = TransConstant.USER_ID_TO_NICKNAME) + @AutoMapping(target = "createBy") + private Long createName; + }