From 1b6ccb5ac0edeb3c7f2ca9035c87b6ec24209c2f Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期三, 22 四月 2026 14:35:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/java/com/ruoyi/basic/dto/ProductModelDto.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/dto/ProductModelDto.java b/src/main/java/com/ruoyi/basic/dto/ProductModelDto.java
index 577d75d..53b3b5d 100644
--- a/src/main/java/com/ruoyi/basic/dto/ProductModelDto.java
+++ b/src/main/java/com/ruoyi/basic/dto/ProductModelDto.java
@@ -1,8 +1,12 @@
package com.ruoyi.basic.dto;
import com.ruoyi.basic.pojo.ProductModel;
+import com.ruoyi.production.dto.ProductStructureDto;
import lombok.Data;
+
+import java.util.List;
@Data
public class ProductModelDto extends ProductModel {
+ private List<ProductStructureDto> productStructureList;
}
--
Gitblit v1.9.3