Merge remote-tracking branch 'origin/dev_New' into dev_New

zss

9 天以前 33730ba5f81f78bf2c63fa792b6b8e65d94c4ca9

 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;
}