From cdbed525ab8395e916b2874ff9e7d59742f320b1 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期六, 11 十月 2025 17:45:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into user_action
---
framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderDetailVO.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderDetailVO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderDetailVO.java
index d10e66f..2908a5d 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderDetailVO.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderDetailVO.java
@@ -1,6 +1,7 @@
package cn.lili.modules.order.order.entity.vo;
+import cn.lili.modules.lmk.domain.entity.UserCheckTemplate;
import cn.lili.modules.order.order.entity.dos.Order;
import cn.lili.modules.order.order.entity.dos.OrderItem;
import cn.lili.modules.order.order.entity.dos.Receipt;
@@ -77,6 +78,8 @@
@ApiModelProperty(value = "浠锋牸璇︽儏")
private String priceDetail;
+ private List<UserCheckTemplate> userCheckTemplates;
+
public OrderDetailVO(Order order, List<OrderItem> orderItems, List<OrderLog> orderLogs,Receipt receipt) {
this.order = order;
this.orderItems = orderItems;
--
Gitblit v1.8.0