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

maven

3 天以前 2a9c3934bb093c978a54a1c3e220e6a120855e77

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

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

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

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