Merge remote-tracking branch 'origin/master'

cuilei

4 天以前 8ac573030c8fc795d9a30afb739f44393f8b63eb

Merge remote-tracking branch 'origin/master'

 src/main/java/org/jeecg/modules/cms/entity/CuttingInbound.java

@@ -61,6 +61,7 @@
    /**入库单状态*/
    @Excel(name = "入库单状态", width = 15)
    @ApiModelProperty(value = "入库单状态")
    @Dict(dicCode = "order_status")
    private String orderStatus;
    /**入库人*/
    @Excel(name = "入库人", width = 15)