From 58b89e49bf6dba960229a94a95d5b9f8821e3f23 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 08 七月 2024 16:34:44 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcProcessQuantityVo.java | 10 ++--------
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcProcessQuantityDto.java | 8 ++------
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcProcessQuantity.java | 3 +--
3 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcProcessQuantityDto.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcProcessQuantityDto.java
index 16aa346..79d2514 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcProcessQuantityDto.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcProcessQuantityDto.java
@@ -1,9 +1,7 @@
package org.jeecg.modules.mdc.dto;
-import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@@ -25,10 +23,8 @@
@Excel(name = "绋嬪簭鍙�", width = 15)
private String sequenceNumber;
private String standardId;
- @Excel(name = "鏃ユ湡", width = 15, format = "yyyy-MM-dd")
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- private Date efficientDate;
+ @Excel(name = "鏃ユ湡", width = 15)
+ private String efficientDate;
@Excel(name = "鍔犲伐鏁伴噺", width = 15)
private Integer processQuantity;
@Excel(name = "鏃堕暱锛堝垎閽燂級", width = 15)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcProcessQuantity.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcProcessQuantity.java
index 13c7747..50467c4 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcProcessQuantity.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcProcessQuantity.java
@@ -15,7 +15,6 @@
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
-import java.util.Date;
/**
* @Description: 鍔犲伐鏁伴噺琛�
@@ -56,7 +55,7 @@
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "鏃ユ湡")
- private Date efficientDate;
+ private String efficientDate;
/**
* 鍔犲伐鏁伴噺
*/
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcProcessQuantityVo.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcProcessQuantityVo.java
index 2412efe..8d45c6b 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcProcessQuantityVo.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcProcessQuantityVo.java
@@ -1,11 +1,7 @@
package org.jeecg.modules.mdc.vo;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.util.Date;
import java.util.List;
/**
@@ -14,10 +10,8 @@
*/
@Data
public class MdcProcessQuantityVo {
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @ApiModelProperty(value = "鏃ユ湡")
- private Date efficientDate;
+
+ private String efficientDate;
private Integer processQuantity;
private String equipmentId;
private String startTime;
--
Gitblit v1.9.3