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

liyong

18 小时以前 6b39b27a2807f4fb60e3b8ac12a1bb5deaad7775

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

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

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

    private String productName;

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