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

liyong

昨天 1765150bd38a53f6466a6e355f231e21f25fc9f2

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