From 65e918de84f0798f208d4a8222393623e890d556 Mon Sep 17 00:00:00 2001 From: chenlu <1320612696@qq.com> Date: 星期六, 03 二月 2024 13:27:09 +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 | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 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 2e74943..83c3705 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.OrderDetail; import lombok.Data; import java.time.LocalDate; @@ -12,14 +13,23 @@ private Long id; private String operationOrderNumber; - private Long productNumber; + private String orderId; private Integer operationNumber; private Integer quantity; private String operateType; private String operator; private LocalDate operateTime; private String staterOperationOrderNumber; - private String endOperationOrderNumber;; + private String endOperationOrderNumber; + + private String status; + private Boolean isState; + private String reviewed; + private LocalDate reviewedTime; + private String type; + private String remarks; + + private OrderDetail orderDetail; } -- Gitblit v1.8.0