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

zss

昨天 2be29256f04c9822dc793c75dfae16c3262d2faf

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

@@ -7,11 +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;
}