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

zss

15 小时以前 e45f6b4649edf03df3973a7dbe76b53b7e57a366

 src/main/java/com/ruoyi/productionPlan/dto/ProductionPlanDto.java

@@ -55,4 +55,5 @@
     */
    @ApiModelProperty("关联物料信息表ID")
    private Long productMaterialId;

}