From b7edb0f3526d5ca32016d5f332ddf957d74c01c2 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期日, 24 十二月 2023 01:24:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/igds-api-gateway' into igds-api-gateway
---
src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogPeople.java | 17 ++---------------
1 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogPeople.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogPeople.java
index 6dc8635..7f85829 100644
--- a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogPeople.java
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogPeople.java
@@ -27,22 +27,9 @@
@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