From 79f0f47f609bd7b166dfcb8e1998a66943930c4a Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 28 九月 2023 18:22:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-recir/src/main/java/com/ld/igds/models/DrugLogPeople.java | 16 ++--------------
1 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/igds-recir/src/main/java/com/ld/igds/models/DrugLogPeople.java b/igds-recir/src/main/java/com/ld/igds/models/DrugLogPeople.java
index 8707f80..1a97371 100644
--- a/igds-recir/src/main/java/com/ld/igds/models/DrugLogPeople.java
+++ b/igds-recir/src/main/java/com/ld/igds/models/DrugLogPeople.java
@@ -26,22 +26,10 @@
@PropertyDef(label = "propleId")
private String propleId;
- @Column(name = "ID_", length = 40)
- @PropertyDef(label = "id")
- private String id;
- @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 = "tbrq")
- @PropertyDef(label = "濉姤鏃ユ湡")
- @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
- private Date tbrq;
@Column(name = "mx", length = 20)
@PropertyDef(label = "濮撳悕")
--
Gitblit v1.9.3