From 651dfb24aa82ea28e6348907bc02dc8c84a6e13f Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 29 六月 2023 19:33:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-core/src/main/java/com/ld/igds/models/InoutRecord.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/models/InoutRecord.java b/igds-core/src/main/java/com/ld/igds/models/InoutRecord.java
index 5c71a3d..cb3f900 100644
--- a/igds-core/src/main/java/com/ld/igds/models/InoutRecord.java
+++ b/igds-core/src/main/java/com/ld/igds/models/InoutRecord.java
@@ -143,7 +143,7 @@
@PropertyDef(label = "璐ㄦ鏃堕棿")
private Date checkTime;
- @Column(name = "SAMPLE_USER_")
+ @Column(name = "SAMPLE_USER_", length = 50)
@PropertyDef(label = "鎵︽牱浜�")
private String sampleUser;
@@ -151,11 +151,11 @@
@PropertyDef(label = "鎵︽牱鏃堕棿")
private Date sampleTime;
- @Column(name = "SAMPLE_TYPE_")
+ @Column(name = "SAMPLE_TYPE_", length = 1)
@PropertyDef(label = "鎵︽牱鏂瑰紡", description = "0-浜哄伐锛�1=鑷姩锛�2=鏅鸿兘闅忔満")
- private Date sampleType;
+ private String sampleType;
- @Column(name = "CHECK_ID_")
+ @Column(name = "CHECK_ID_", length = 12)
@PropertyDef(label = "璐ㄦ鍗曞彿")
private String checkId;
@@ -193,7 +193,7 @@
@PropertyDef(label = "绌鸿溅绉伴噸鏃堕棿")
private Date emptyWeightTime;
- @Column(name = "EMPTY_WEIGHT_USER_")
+ @Column(name = "EMPTY_WEIGHT_USER_", length = 50)
@PropertyDef(label = "绌鸿溅绉伴噸浜�")
private String emptyWeightUser;
@@ -237,7 +237,7 @@
@PropertyDef(label = "缁撶畻閲戦", description = "鍗曚綅锛氬厓")
private Double settleMoney = 0.00;
- @Column(name = "SETTLE_ID_")
+ @Column(name = "SETTLE_ID_", length = 50)
@PropertyDef(label = "缁撶畻鍗曞彿", description = "濡傛灉鏄崟杞︾粨绠楀繀濉�")
private String settleId;
@@ -270,11 +270,11 @@
@PropertyDef(label = "鍖呰鐗�", description = "1锛氶夯琚�2锛氱紪缁囪3锛氭暎瑁�9锛氬叾浠�")
private String bzw;
- @Column(name = "dbz", length = 2)
+ @Column(name = "dbz")
@PropertyDef(label = "鍗曞寘閲�", description = "鍗曚綅锛氬叕鏂�")
private Double dbz;
- @Column(name = "bzbjs", length = 2)
+ @Column(name = "bzbjs")
@PropertyDef(label = "鍖呬欢鏁�", description = "鍗曚綅锛氫欢")
private int bzbjs;
--
Gitblit v1.9.3