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

zss

9 小时以前 124a6178ae918de05886b52199b7755d4fa1ece3

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

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

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

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