From 11ec7ac8f4832c4274cf61a19cc35cda3de9e0e5 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期三, 09 七月 2025 16:04:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/linghu/model/dto/OrderDto.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/linghu/model/dto/OrderDto.java b/src/main/java/com/linghu/model/dto/OrderDto.java
index 6043fe2..368ca44 100644
--- a/src/main/java/com/linghu/model/dto/OrderDto.java
+++ b/src/main/java/com/linghu/model/dto/OrderDto.java
@@ -1,17 +1,21 @@
package com.linghu.model.dto;
-import com.linghu.model.entity.Order;
+import com.linghu.model.entity.Orders;
import lombok.Data;
import lombok.EqualsAndHashCode;
+
+import java.util.List;
/**
* 订单数据传输对象，扩展Order实体
*/
@Data
@EqualsAndHashCode(callSuper = true)
-public class OrderDto extends Order {
+public class OrderDto extends Orders {
/**
* 关键词列表，用换行符分隔
*/
private String keywords;
+
+ private List<KeywordDto> keywordList;
}
\ No newline at end of file
--
Gitblit v1.7.1