From fb8c147422f4359bd0f6f51203cd9ed0e8c6eb4d Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 25 五月 2026 15:09:11 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_天津_中兴实强
---
src/main/java/com/ruoyi/basic/dto/ProductModelDto.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/dto/ProductModelDto.java b/src/main/java/com/ruoyi/basic/dto/ProductModelDto.java
index 53b3b5d..15e428d 100644
--- a/src/main/java/com/ruoyi/basic/dto/ProductModelDto.java
+++ b/src/main/java/com/ruoyi/basic/dto/ProductModelDto.java
@@ -1,11 +1,13 @@
package com.ruoyi.basic.dto;
import com.ruoyi.basic.pojo.ProductModel;
-import com.ruoyi.production.dto.ProductStructureDto;
+import com.ruoyi.production.bean.dto.ProductStructureDto;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.util.List;
+@EqualsAndHashCode(callSuper = true)
@Data
public class ProductModelDto extends ProductModel {
private List<ProductStructureDto> productStructureList;
--
Gitblit v1.9.3