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-eam/src/main/java/org/jeecg/modules/spare/vo/SparePartReceiveVo.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/vo/SparePartReceiveVo.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/vo/SparePartReceiveVo.java
index 3cf32d5..16d45cb 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/vo/SparePartReceiveVo.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/vo/SparePartReceiveVo.java
@@ -241,14 +241,14 @@
@Excel(name = "鍒涘缓鏃堕棿", width = 20, format = "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")
- private Date createTime;
+ private java.util.Date createTime;
/**
* 鏇存柊浜�
*/
@ApiModelProperty(value = "鏇存柊浜�")
@Excel(name = "鏇存柊浜�", width = 15)
- private String updateBy;
+ private java.lang.String updateBy;
/**
* 鏇存柊鏃堕棿
@@ -257,5 +257,5 @@
@Excel(name = "鏇存柊鏃堕棿", width = 20, format = "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")
- private Date updateTime;
+ private java.util.Date updateTime;
}
--
Gitblit v1.9.3