Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材

gongchunyi

昨天 51c806f81b4498b2196025c97a94c51b1bb3eeb9

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

@@ -15,12 +15,17 @@
    @ApiModelProperty(value = "工艺名称")
    private String processName;

    @ApiModelProperty(value = "产品编码")
    private String productCode;

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

    @ApiModelProperty(value = "产品id")
    //宁夏-中盛建材使用新的产品表关联product_material
    private Long productId;

    @ApiModelProperty(value = "规格型号")
    private String model;

    @TableField(exist = false)