Merge branch 'jtwy' into dev_New

zss

17 小时以前 2757f1d46f388f684aad93b3dc7ad805c45c6248

 src/main/java/com/ruoyi/production/dto/ProductStructureDto.java

@@ -4,13 +4,19 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

@Data
public class ProductStructureDto extends ProductStructure {

    @ApiModelProperty(value = "工艺名称")
    private String processName;
    @ApiModelProperty(value = "产品名称")
    private String speculativeTradingName;
    private String productName;
    @ApiModelProperty(value = "产品id")
    private Long productId;

    private String model;

    private List<ProductStructure> productStructureList;
}