From 100018950d03efb3b7b2ae26dbd69c0bb2573c28 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 24 十二月 2024 15:41:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderInfoVo.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderInfoVo.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderInfoVo.java
index 75039e3..a6bfc35 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderInfoVo.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderInfoVo.java
@@ -54,5 +54,11 @@
private Integer goodsNum;
@ApiModelProperty("商品信息")
private String goodsJson;
+ @ApiModelProperty("核销时间")
+ private String writeOffTime;
+ @ApiModelProperty("服务技师")
+ private String technicianName;
+ @ApiModelProperty("分佣金额")
+ private BigDecimal subcommission;
}
--
Gitblit v1.7.1