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

liyong

4 天以前 f5624a59380db70633eebe3612e2d3c703012b41

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

@@ -22,4 +22,7 @@

    @ApiModelProperty(value = "是否报工")
    private boolean reportWork;

    @ApiModelProperty(value = "报工id")
    private Long productMainId;
}