From 1b004047f00cc846924209051ee654619c56a249 Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期三, 06 十二月 2023 16:17:42 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/entity/TMixingConsume.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/entity/TMixingConsume.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/entity/TMixingConsume.java
index 0a243a9..49b95b8 100644
--- a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/entity/TMixingConsume.java
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/entity/TMixingConsume.java
@@ -1,5 +1,6 @@
package com.thhy.materials.modules.biz.concret.entity;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
@@ -64,6 +65,10 @@
private String dictName;
private Integer star;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private String createTime;
+ //施工单位
+ private String constructionUnit;
/**
* This field was generated by MyBatis Generator.
--
Gitblit v1.9.3