Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

廖井涛

9 天以前 1e6c537c6ae83a30fa3732939d16422ff2d105dd

 north-glass-erp/src/main/java/com/example/erp/entity/mm/MaterialLog.java

@@ -53,5 +53,9 @@
    @ExcelProperty("优化使用数量")
    private Integer useCount;

    private MaterialOutbound materialOutbound;

    private MaterialOutboundDetail materialOutboundDetail;


}