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

guoyujie

3 天以前 748e47eb02e874e521500b24f5444d6dbaeda3b8

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

@@ -50,5 +50,12 @@
    @ExcelProperty("创建时间")
    private LocalDate operateTime;

    @ExcelProperty("优化使用数量")
    private Integer useCount;

    private MaterialOutbound materialOutbound;

    private MaterialOutboundDetail materialOutboundDetail;


}