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

liyong

9 天以前 8e941a8eac3329725cdd59cfa2bf3482ccbf057a

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

@@ -94,4 +94,8 @@
    @Excel(name = "色数",sort = 9)
    private String printColorCount;

    private Long printId;

    private Integer hasProduct;

}