From 6ded5f4ababd82c4c93b5e88b1132f1869340776 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 16 十二月 2024 14:40:43 +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/sd/BasicData.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/sd/BasicData.java b/north-glass-erp/src/main/java/com/example/erp/entity/sd/BasicData.java
index fa6bba9..8fbf8db 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/sd/BasicData.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/sd/BasicData.java
@@ -11,8 +11,9 @@
@TableId(type = IdType.AUTO)
private Integer id;
private String basicType;
- private String name;
- private String type;
+ private String basicName;
+ private String nickname;
+ private String basicCategory;
private LocalDate createTime;
private LocalDate updateTime;
}
--
Gitblit v1.8.0