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

zss

11 小时以前 f68d79d0ff6658795c19c2fd473fab9ff6f0640d

 src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java

@@ -32,6 +32,9 @@
    @ApiModelProperty(value = "工单id")
    private Long workOrderId;

    @ApiModelProperty(value = "生产订单id")
    private Long productOrderId;

    @ApiModelProperty(value = "报工状态")
    private Integer status;