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-recir/src/main/java/com/ld/igds/models/DrugLogDtl.java | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/igds-recir/src/main/java/com/ld/igds/models/DrugLogDtl.java b/igds-recir/src/main/java/com/ld/igds/models/DrugLogDtl.java
index 633b681..ca89998 100644
--- a/igds-recir/src/main/java/com/ld/igds/models/DrugLogDtl.java
+++ b/igds-recir/src/main/java/com/ld/igds/models/DrugLogDtl.java
@@ -22,21 +22,13 @@
public class DrugLogDtl implements Serializable {
@Id
- @Column(name = "ID_", length = 40)
- @PropertyDef(label = "id")
- private String id;
+ @Column(name = "DTL_ID_", length = 40)
+ @PropertyDef(label = "dtlId")
+ private String dtlId;
- @Column(name = "DRUG_LOG_ID_", length = 4)
- @PropertyDef(label = "鐔忚捀澶囨缂栧彿", description = "4浣嶉『搴忓彿")
+ @Column(name = "DRUG_LOG_ID_", length = 12)
+ @PropertyDef(label = "鐔忚捀澶囨缂栧彿", description = "濉姤鏃ユ湡yyyyMMdd+4浣嶉『搴忓彿")
private String drugLogId;
-
- @Column(name = "DEPT_ID_", length = 21)
- @PropertyDef(label = "搴撳尯浠ｇ爜")
- private String deptId;
-
- @Column(name = "COMPANY_ID_", length = 10)
- @PropertyDef(label = "缁勭粐缂栫爜")
- private String companyId;
@Column(name = "DEPOT_ID_", length = 50)
@PropertyDef(label = "浠撴埧/娌圭綈浠ｇ爜")
@@ -70,6 +62,10 @@
@PropertyDef(label = "绮俯")
private Double lw;
+ @Column(name = "cw", precision = 20, scale = 3)
+ @PropertyDef(label = "浠撴俯")
+ private Double cw;
+
@Column(name = "cnsd", precision = 20, scale = 3)
@PropertyDef(label = "浠撳唴婀垮害")
private Double cnsd;
--
Gitblit v1.9.3