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

liyong

10 天以前 ff181c705c98885282668990c84219d17e04be0b

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

@@ -11,8 +11,8 @@

    @ApiModelProperty(value = "工艺名称")
    private String processName;
    @ApiModelProperty(value = "生产炒机")
    private String speculativeTradingName;
    @ApiModelProperty(value = "产品名称")
    private String productName;
    @ApiModelProperty(value = "产品id")
    private Long productId;