From 6f2a4980f4ca7a794b103cfde9946a905c5ba399 Mon Sep 17 00:00:00 2001
From: NNowhZzU <1539353356@qq.com>
Date: 星期五, 26 一月 2024 16:21:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/java/com/example/erp/entity/sd/BasicData.java | 4 ++--
1 files changed, 2 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..fa8d582 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,8 @@
@TableId(type = IdType.AUTO)
private Integer id;
private String basicType;
- private String name;
- private String type;
+ private String basicName;
+ private String basicCategory;
private LocalDate createTime;
private LocalDate updateTime;
}
--
Gitblit v1.8.0