From 7b53707f0a9a195d56f8010e5b377eacba55609b Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 19 三月 2026 10:23:00 +0800
Subject: [PATCH] Merge branch 'dev_New_kthg' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_kthg
---
src/main/java/com/ruoyi/basic/dto/ProductModelDto.java | 7 +++++++
1 files changed, 7 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..f4fa73a 100644
--- a/src/main/java/com/ruoyi/basic/dto/ProductModelDto.java
+++ b/src/main/java/com/ruoyi/basic/dto/ProductModelDto.java
@@ -1,8 +1,15 @@
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 Long productId;
+
+ private List<ProductStructureDto> productStructureList;
}
--
Gitblit v1.9.3