From 899d74ab3d00f7d0b0909d23551b1f971e2edea4 Mon Sep 17 00:00:00 2001
From: WS <1143478319@qq.com>
Date: 星期四, 17 八月 2023 18:57:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/api/entity/Api1108.java | 18 ++++++++++++------
1 files changed, 12 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 fbc3bda..9b7d610 100644
--- a/src/main/java/com/fzzy/api/entity/Api1108.java
+++ b/src/main/java/com/fzzy/api/entity/Api1108.java
@@ -2,6 +2,7 @@
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;
@@ -17,14 +18,14 @@
@Data
@Entity
@Table(name = "API_1108")
-public class Api1108 implements Serializable {
+public class Api1108 implements Serializable {
/**
- *
- */
- private static final long serialVersionUID = -7131774374918644731L;
+ *
+ */
+ private static final long serialVersionUID = -7131774374918644731L;
- @Id
+ @Id
@Column(name = "ID_", length = 40)
@JsonIgnore
private String id;
@@ -92,7 +93,8 @@
@PropertyDef(label = "淇濊川鏈�")
@Column(name = "bzq", length = 20)
- private String bzq;
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date bzq;
@PropertyDef(label = "閲囪喘鏃ユ湡")
@JSONField(format = "yyyy-MM-dd")
@@ -103,6 +105,10 @@
@Column(name = "kcsl", precision = 20, scale = 6)
private Double kcsl;
+ @Column(name = "kcsldw", length = 1)
+ @PropertyDef(label = "搴撳瓨閲忓崟浣�", description = "1(榛樿)锛氬叕鏂わ紱2锛氬厠锛�3锛氭鍗囷紱")
+ private String kcsldw;
+
@PropertyDef(label = "鎿嶄綔鏍囧織")
@Column(name = "czbz", length = 1)
private String czbz;
--
Gitblit v1.9.3