From 900b4223386a8010e80f1091c4371c19e9117d63 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 27 二月 2024 13:50:42 +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/sd/OrderGlassDetail.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderGlassDetail.java b/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderGlassDetail.java
index 34cb9ea..e2f059f 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderGlassDetail.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderGlassDetail.java
@@ -1,6 +1,7 @@
package com.example.erp.entity.sd;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
@@ -11,20 +12,28 @@
@TableId(type = IdType.AUTO)
private Long id;
+ private String orderId;
+ private String orderNumber;
private Integer technologyNumber;
private String glassAddress;
private String glassChild;
private Double childWidth;
private Double childHeight;
+ private Double area;
+ private Double totalArea;
+ private String icon;
private String process;
private String productionId;
private Integer splittingStatus;
private String founder;
+ @TableField(value = "`group`")
private Integer group;
- private LocalDate produtionTime;
+ private LocalDate productionTime;
private LocalDate createTime;
-
+// @TableField(select = false)
private Order order;
+ //@TableField(select = false)
+// @ManyToOne(fetch = FetchType.LAZY)
private OrderDetail orderDetail;
--
Gitblit v1.8.0