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/api/entity/Api1108.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1108.java b/src/main/java/com/fzzy/api/entity/Api1108.java
index 9b7d610..1ed5a9d 100644
--- a/src/main/java/com/fzzy/api/entity/Api1108.java
+++ b/src/main/java/com/fzzy/api/entity/Api1108.java
@@ -2,10 +2,10 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
-import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
import javax.persistence.*;
@@ -15,7 +15,8 @@
/**
* 鎺ュ彛琛�-鑽墏淇℃伅
*/
-@Data
+@Getter
+@Setter
@Entity
@Table(name = "API_1108")
public class Api1108 implements Serializable {
@@ -92,9 +93,8 @@
private String czclfs;
@PropertyDef(label = "淇濊川鏈�")
- @Column(name = "bzq", length = 20)
- @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
- private Date bzq;
+ @Column(name = "bzq", length = 40)
+ private String bzq;
@PropertyDef(label = "閲囪喘鏃ユ湡")
@JSONField(format = "yyyy-MM-dd")
--
Gitblit v1.9.3