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

yaowanxin

9 天以前 d4b9db2b8958355b9960d57088af9865bb2b2f0d

 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;