From 86adbb1544142dcfb48333dade822f81640607a6 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期五, 01 九月 2023 13:50:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
base-server/src/main/java/com/yuanchu/mom/pojo/Device.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/mom/pojo/Device.java b/base-server/src/main/java/com/yuanchu/mom/pojo/Device.java
similarity index 91%
rename from standard-server/src/main/java/com/yuanchu/mom/pojo/Device.java
rename to base-server/src/main/java/com/yuanchu/mom/pojo/Device.java
index 741933a..02a6407 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/pojo/Device.java
+++ b/base-server/src/main/java/com/yuanchu/mom/pojo/Device.java
@@ -43,12 +43,13 @@
private String father;
@ApiModelProperty(value = "绫诲瀷 1:鐢熶骇璁惧锛�2锛氭娴嬭澶�", example = "1")
- private String type;
+ private Integer type;
@ApiModelProperty(value = "淇濈浜�", example = "1")
private Integer keeper;
@ApiModelProperty(value = "璁￠噺鎴鏈夋晥鏈�", example = "2023-08-09", dataType = "date")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date endMeasure;
@ApiModelProperty(value = "璁惧鐘舵�� 1:杩愯锛�2:鎶ュ簾锛�3:妫�淇紱4:鏁呴殰锛�5:绌洪棽", example = "1")
@@ -62,16 +63,15 @@
private Integer rawInsProductId;
@ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0", hidden = true)
- @TableLogic(value = "1", delval = "0")
private Integer state;
@TableField(fill = FieldFill.INSERT)
@ApiModelProperty(value = "鍒涘缓鏃堕棿", hidden = true)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date createTime;
@TableField(fill = FieldFill.INSERT_UPDATE)
@ApiModelProperty(value = "鏇存柊鏃堕棿", hidden = true)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date updateTime;
}
--
Gitblit v1.9.3