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/Drug.java | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/igds-recir/src/main/java/com/ld/igds/models/Drug.java b/igds-recir/src/main/java/com/ld/igds/models/Drug.java
index b15da85..ce55d28 100644
--- a/igds-recir/src/main/java/com/ld/igds/models/Drug.java
+++ b/igds-recir/src/main/java/com/ld/igds/models/Drug.java
@@ -26,15 +26,13 @@
@Id
@Column(name = "ID_", length = 40)
- @PropertyDef(label = "鑽墏缂栧彿", description = "搴撳尯浠ｇ爜+涓変綅椤哄簭鍙�")
+ @PropertyDef(label = "鑽墏缂栧彿", description = "閲囪喘鏃ユ湡(yyyyMMdd)+涓変綅椤哄簭鍙�")
private String id;
- @Id
@Column(name = "DEPT_ID_", length = 50)
@PropertyDef(label = "搴撳尯浠ｇ爜")
private String deptId;
- @Id
@Column(name = "cgrq")
@PropertyDef(label = "閲囪喘鏃ユ湡")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
--
Gitblit v1.9.3