Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

liyong

9 天以前 8e941a8eac3329725cdd59cfa2bf3482ccbf057a

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

@@ -53,4 +53,6 @@

    @ApiModelProperty(value = "是否可以报工")
    private Boolean hasUnreportedMachine;

    private String finalProductModel;
}