From d5bb894f9be2e0a3b62d475b60b44f2ab138528c Mon Sep 17 00:00:00 2001 From: guoyujie <guoyujie@ng.com> Date: 星期四, 12 六月 2025 16:48:35 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override --- north-glass-erp/src/main/java/com/example/erp/entity/mm/FinishedOperateLog.java | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/mm/FinishedOperateLog.java b/north-glass-erp/src/main/java/com/example/erp/entity/mm/FinishedOperateLog.java index 83c3705..344a800 100644 --- a/north-glass-erp/src/main/java/com/example/erp/entity/mm/FinishedOperateLog.java +++ b/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; @@ -28,8 +29,11 @@ private LocalDate reviewedTime; private String type; private String remarks; + private String processId; private OrderDetail orderDetail; + private Order order; + } -- Gitblit v1.8.0