From 32bcf3f12aef0de69f7cb83d3521b2452a01e50d Mon Sep 17 00:00:00 2001
From: wenwj <‘1106994300@qq.com>
Date: 星期六, 12 四月 2025 17:28:29 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsResourceGroup.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsResourceGroup.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsResourceGroup.java
index 5b20f9b..243c864 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsResourceGroup.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsResourceGroup.java
@@ -1,5 +1,6 @@
package com.aps.core.domain;
+import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.aps.common.core.annotation.Excel;
@@ -41,14 +42,15 @@
private Long theoryCapacity;
/** 鏈哄姞闇�姹傛棩鏈� */
- @Excel(name = "鏈哄姞闇�姹傛棩鏈�")
+ @Excel(name = "鏈哄姞闇�姹傛棩鏈�",width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime requestDate;
/** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
private String delFlag;
/** 宸ュ巶 */
- @Excel(name = "宸ュ巶")
+// @Excel(name = "宸ュ巶")
private String plant;
public void setId(String id)
--
Gitblit v1.9.3