From df143921e8ec85b43420b71961d73825521911d1 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 23 十月 2025 10:14:49 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/entity/mm/FinishedOperateLog.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 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..1530673 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,10 +2,13 @@
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 com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.time.LocalDate;
+import java.time.LocalDateTime;
@Data
public class FinishedOperateLog {
@@ -18,7 +21,8 @@
private Integer quantity;
private String operateType;
private String operator;
- private LocalDate operateTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime operateTime;
private String staterOperationOrderNumber;
private String endOperationOrderNumber;
@@ -28,8 +32,15 @@
private LocalDate reviewedTime;
private String type;
private String remarks;
+ private String processId;
+
+ private Double area;
+ private Double money;
+ private Double computeArea;
private OrderDetail orderDetail;
+ private Order order;
+
}
--
Gitblit v1.8.0