From deee597fa30e9a40792a4eb094b6ce45a35bc13f Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期二, 22 八月 2023 23:07:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-recir/src/main/java/com/ld/igds/models/DrugLogWay.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/igds-recir/src/main/java/com/ld/igds/models/DrugLogWay.java b/igds-recir/src/main/java/com/ld/igds/models/DrugLogWay.java
index 8c57292..08a7530 100644
--- a/igds-recir/src/main/java/com/ld/igds/models/DrugLogWay.java
+++ b/igds-recir/src/main/java/com/ld/igds/models/DrugLogWay.java
@@ -1,6 +1,8 @@
package com.ld.igds.models;
+import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import javax.persistence.Column;
@@ -8,6 +10,7 @@
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
+import java.util.Date;
/**
* 鐔忚捀澶囨鏂瑰紡琛�
@@ -20,8 +23,12 @@
public class DrugLogWay implements Serializable {
@Id
+ @Column(name = "WAY_ID_", length = 40)
+ @PropertyDef(label = "wayId")
+ private String wayId;
+
@Column(name = "ID_", length = 40)
- @PropertyDef(label = "id")
+ @PropertyDef(label = "id",description = "涓庡妗堜俊鎭叧鑱擨D 鐔忚捀缂栫爜+搴撳尯浠ｇ爜+濉姤鏃ユ湡")
private String id;
@Column(name = "DRUG_LOG_ID_", length = 4)
@@ -30,11 +37,13 @@
@Column(name = "DEPT_ID_", length = 21)
@PropertyDef(label = "搴撳尯浠ｇ爜")
+ @JSONField
private String deptId;
- @Column(name = "COMPANY_ID_", length = 10)
- @PropertyDef(label = "缁勭粐缂栫爜")
- private String companyId;
+ @Column(name = "tbrq")
+ @PropertyDef(label = "濉姤鏃ユ湡")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date tbrq;
@Column(name = "xznd", precision = 20, scale = 3)
@PropertyDef(label = "璁惧畾鐔忚捀娴撳害", description = "鍗曚綅锛歮l/m鲁")
--
Gitblit v1.9.3