From f7ca9752b8cc4d81d75a23bbcd89227a2e3abe69 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 24 十二月 2025 07:59:18 +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, 13 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 1530673..ce6ee15 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
@@ -1,6 +1,7 @@
 package com.example.erp.entity.mm;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.example.erp.entity.sd.Order;
 import com.example.erp.entity.sd.OrderDetail;
@@ -38,6 +39,18 @@
     private Double money;
     private Double computeArea;
 
+    /*搴撳瓨鏁伴噺*/
+    @TableField(select = false,exist = false)
+    private Integer quantityAvailable;
+
+    /*骞虫柟姣背*/
+    @TableField(select = false,exist = false)
+    private Double squareMillimeter;
+
+    /*鎾ら攢鏁伴噺*/
+    @TableField(select = false,exist = false)
+    private Integer cancelAvailable;
+
     private OrderDetail orderDetail;
 
     private Order order;

--
Gitblit v1.8.0