From c46cb6a71c35f38c7f23a2d01ad686f46a3d0e0b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 26 六月 2024 15:14:44 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/entity/pp/DamageDetails.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/pp/DamageDetails.java b/north-glass-erp/src/main/java/com/example/erp/entity/pp/DamageDetails.java
index 9c03fa7..36c508e 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/pp/DamageDetails.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/pp/DamageDetails.java
@@ -1,7 +1,11 @@
package com.example.erp.entity.pp;
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.OrderGlassDetail;
+import com.example.erp.entity.sd.Product;
import lombok.Data;
@@ -26,7 +30,7 @@
//绫诲瀷
private String breakageType;
//鍙埄鐢�
- private Integer available;
+ private Boolean available;
//閫�鍥炲伐搴�
private String returnProcess;
//璐ｄ换宸ュ簭
@@ -43,4 +47,18 @@
private Integer patchStatus;
//璐ㄦ鐘舵��
private Integer qualityInsStatus;
+ //鏁伴噺
+ private Integer quantity;
+
+ @TableField(select = false,exist = false)
+ private String area;
+
+ @TableField(select = false,exist = false)
+ private ReportingWork reportingWork;
+
+ @TableField(select = false,exist = false)
+ private Order order;
+
+ @TableField(select = false,exist = false)
+ private OrderGlassDetail orderGlassDetail;
}
--
Gitblit v1.8.0