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

liyong

4 天以前 877504ede165b8c965b6cf6599708e7e48778034

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

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

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

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