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

zss

昨天 e2c5b3a68bf3da47f5c1adf217ca96c7ec9a0076

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

@@ -7,6 +7,12 @@
@Data
public class ProcessRouteDto extends ProcessRoute {

    @ApiModelProperty(value = "产品名称")
    private String speculativeTradingName;
    private Long productId;

    private String productName;

    @ApiModelProperty("规格")
    private String model;

    private String bomNo;
}