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

zss

10 天以前 33730ba5f81f78bf2c63fa792b6b8e65d94c4ca9

 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;