From 4143abe3b122c303230464a1147fde23cd3c3064 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期五, 25 八月 2023 15:34:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-recir/src/main/java/com/ld/igds/models/DrugLogApply.java | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/igds-recir/src/main/java/com/ld/igds/models/DrugLogApply.java b/igds-recir/src/main/java/com/ld/igds/models/DrugLogApply.java
index 6d03bad..5b7cd4d 100644
--- a/igds-recir/src/main/java/com/ld/igds/models/DrugLogApply.java
+++ b/igds-recir/src/main/java/com/ld/igds/models/DrugLogApply.java
@@ -20,9 +20,9 @@
public class DrugLogApply implements Serializable {
@Id
- @Column(name = "ID_", length = 4)
+ @Column(name = "xzbm", length = 4)
@PropertyDef(label = "鐔忚捀澶囨缂栧彿", description = "4浣嶉『搴忓彿")
- private String id;
+ private String xzbm;
@Id
@Column(name = "DEPT_ID_", length = 21)
@@ -33,6 +33,7 @@
@PropertyDef(label = "缁勭粐缂栫爜")
private String companyId;
+ @Id
@Column(name = "tbrq")
@PropertyDef(label = "濉姤鏃ユ湡")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
@@ -60,11 +61,11 @@
private String xcfzr;
@Column(name = "fzrzw", length = 10)
- @PropertyDef(label = "璐熻矗浜鸿亴鍔�")
- private String fzrzw;
+ @PropertyDef(label = "鐜板満璐熻矗浜鸿亴鍔�")
+ private String xcfzrzw;
@Column(name = "xcfzrdh", length = 11)
- @PropertyDef(label = "鐜板満璐熻矗浜�")
+ @PropertyDef(label = "鐜板満璐熻矗浜虹數璇�")
private String xcfzrdh;
@Column(name = "tbr", length = 20)
@@ -139,15 +140,26 @@
@PropertyDef(label = "棰嗗彇浜�")
private String lqr;
+ @Column(name = "lqsj")
+ @PropertyDef(label = "棰嗗彇鏃堕棿")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date lqsj;
+
@Column(name = "UPDATE_TIME_")
@PropertyDef(label = "鏇存柊鏃堕棿")
private Date updateTime;
+
/**
* 鍌ㄧ伯绮儏鏄庣粏琛�
+ *
*/
-// @Transient
-// private List<DrugLogDtl> drugLogDtls;
+ @Transient
+ private List<DrugLogDtl> drugLogDtls;
+
+ @Column(name = "DTL_ID_", length = 40)
+ @PropertyDef(label = "dtlId")
+ private String dtlId;
@Column(name = "DEPOT_ID_", length = 50)
@PropertyDef(label = "浠撴埧/娌圭綈浠ｇ爜")
@@ -245,8 +257,13 @@
/**
* 鐔忚捀澶囨鏂瑰紡
*/
-// @Transient
-// private List<DrugLogWay> drugLogWays;
+ @Transient
+ private List<DrugLogWay> drugLogWays;
+
+ @Column(name = "Way_ID_", length = 40)
+ @PropertyDef(label = "wayId")
+ private String wayId;
+
@Column(name = "xznd", precision = 20, scale = 3)
@PropertyDef(label = "璁惧畾鐔忚捀娴撳害", description = "鍗曚綅锛歮l/m鲁")
private Double xznd;
--
Gitblit v1.9.3