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

chenlu

2024-12-16 6ded5f4ababd82c4c93b5e88b1132f1869340776

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

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.example.erp.entity.sd.Order;
import com.example.erp.entity.sd.OrderDetail;
import lombok.Data;

@@ -32,5 +33,7 @@

    private OrderDetail orderDetail;

    private Order order;


}