Merge branch 'dev_New_pro' into dev_天津_宝东pro

云

2026-05-15 3a941e0fc821d879d5f17b41dfc6d9c7688862dc

 src/main/java/com/ruoyi/basic/dto/ProductModelDto.java

@@ -3,9 +3,11 @@
import com.ruoyi.basic.pojo.ProductModel;
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;