Merge remote-tracking branch 'origin/dev_New_pro' into dev_浪潮_pro

liyong

2026-05-11 8f50f1998f94c455bdae946fead91aad3ea09b02

 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.bean.dto.ProductStructureDto;
import lombok.Data;

import java.util.List;

@Data
public class ProductModelDto extends ProductModel {
    private List<ProductStructureDto> productStructureList;
}