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

liyong

9 小时以前 1765150bd38a53f6466a6e355f231e21f25fc9f2

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

@@ -2,11 +2,13 @@

import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.production.pojo.ProductWorkOrder;
import com.ruoyi.production.pojo.ProductWorkOrderFile;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.math.BigDecimal;
import java.util.List;

@EqualsAndHashCode(callSuper = true)
@Data
@@ -35,4 +37,7 @@

    @ApiModelProperty(value = "完成进度")
    private BigDecimal completionStatus;

    @ApiModelProperty(value = "报废数量")
    private BigDecimal scrapQty;
}