From 43ce77a85d8297a53dc25430fff10ead57296167 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期六, 04 十一月 2023 15:43:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-core/src/main/java/com/ld/igds/models/DepotBookStore.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/models/DepotBookStore.java b/igds-core/src/main/java/com/ld/igds/models/DepotBookStore.java
index d6ab5d9..ff2ecaf 100644
--- a/igds-core/src/main/java/com/ld/igds/models/DepotBookStore.java
+++ b/igds-core/src/main/java/com/ld/igds/models/DepotBookStore.java
@@ -3,8 +3,6 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
-import org.springframework.stereotype.Component;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
@@ -16,6 +14,8 @@
* @Author: YYC
* @Description:璐﹂潰搴撳瓨
* @DateTime: 2023/10/20 14:07
+ *
+ * 鎸変粨搴撹繘琛岀粺璁★紝姣忎釜鏈堜綆缁熻涓�娆�(鍥犱笂娴峰競璐﹂潰搴撳瓨鎺ュ彛涓烘寜璐т綅缁熻)
**/
@Data
@Entity
@@ -34,9 +34,13 @@
@PropertyDef(label = "缁勭粐缂栫爜")
private String companyId;
- @Column(name = "kqdm", length = 21)
+ @Column(name = "DEPT_ID_", length = 20)
@PropertyDef(label = "搴撳尯浠ｇ爜")
- private String kqdm;
+ private String deptId;
+
+ @Column(name = "DEPOT_ID_", length = 30)
+ @PropertyDef(label = "浠撳簱缂栫爜")
+ private String depotId;
@Column(name = "lspzdm", length = 7)
@PropertyDef(label = "绮鍝佺浠ｇ爜")
@@ -74,10 +78,6 @@
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "涓氬姟鏃ユ湡")
private Date ywrq;
-
- @Column(name = "czbz", length = 1)
- @PropertyDef(label = "鎿嶄綔鏍囧織")
- private String czbz;
@Column(name = "zhgxsj")
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
--
Gitblit v1.9.3