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

maven

17 小时以前 1cf92e13371b55c4449ccb48b264eea547eccb86

 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;