From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentType.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentType.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentType.java
index b95cff8..6dd2dbf 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentType.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentType.java
@@ -26,7 +26,7 @@
@EqualsAndHashCode(callSuper = false)
@ApiModel(value = "mdc_equipment_type瀵硅薄", description = "璁惧绫诲瀷")
public class MdcEquipmentType implements Serializable {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = -1221190063635607030L;
/**
* 涓婚敭
@@ -37,7 +37,7 @@
/**
* 璁惧绫诲瀷鍚嶇О
*/
- @Excel(name = "璁惧绫诲瀷鍚嶇О",width = 15)
+ @Excel(name = "璁惧绫诲瀷鍚嶇О", width = 15)
@ApiModelProperty(value = "璁惧绫诲瀷鍚嶇О")
private String equipmentTypeName;
/**
@@ -61,8 +61,8 @@
/**
* 鍒涘缓鏃ユ湡
*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "鍒涘缓鏃ユ湡")
private Date createTime;
/**
@@ -73,8 +73,8 @@
/**
* 鏇存柊鏃ユ湡
*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "鏇存柊鏃ユ湡")
private Date updateTime;
--
Gitblit v1.9.3