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

liyong

5 天以前 8817c6ab14348b360db70ad748dccb4aef692552

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

@@ -1,18 +1,34 @@
package com.ruoyi.production.dto;

import com.baomidou.mybatisplus.annotation.TableField;
import com.ruoyi.production.pojo.ProductStructure;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.util.List;

@Data
@EqualsAndHashCode(callSuper = true)
public class ProductStructureDto extends ProductStructure {

    @ApiModelProperty(value = "工艺名称")
    private String processName;
    @ApiModelProperty(value = "生产炒机")
    private String speculativeTradingName;

    @ApiModelProperty(value = "产品名称")
    private String productName;

    @ApiModelProperty(value = "产品id")
    private Long productId;

    private String model;

    @TableField(exist = false)
    private String tempId;

    @TableField(exist = false)
    private String parentTempId;

    @TableField(exist = false)
    private List<ProductStructureDto> children;
}