From 13d2dca3c08afcab131a9a350a5c5ad3ff6b2bee Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 02 二月 2024 15:44:39 +0800
Subject: [PATCH] 解决部分冲突
---
north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java b/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java
index bf6cc10..1492691 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java
@@ -12,7 +12,6 @@
@TableId(type = IdType.AUTO)
private Long id;
private String orderId;
- private String orderId;
private Integer orderNumber;
private String buildingNumber;
private Integer productId;
--
Gitblit v1.8.0