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

云

8 天以前 b5f0127bd07d590b262169af5ea1b958fc707265

 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;