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

maven

15 小时以前 55c4143362c7df1ece4523597e26947d35e21bda

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

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

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

    private Long productId;

    private String productName;

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