From 7f615dc1f37ccc9efd7f5b2f7e044c2e62f01074 Mon Sep 17 00:00:00 2001
From: gonglilong <328255720@qq.com>
Date: Sat, 14 Sep 2024 14:11:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/entity/MaterialsManage.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/entity/MaterialsManage.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/entity/MaterialsManage.java
index 611ea87..8801d91 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/entity/MaterialsManage.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/entity/MaterialsManage.java
@@ -3,12 +3,17 @@
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
+import java.util.Date;
/**
* @PROJECT_NAME: skjcmanager
@@ -17,11 +22,17 @@
* @DATE: 2023/5/30 14:52
*/
@Data
-@TableName("sm_materials_manage")
+@TableName(value = "sm_materials_manage",autoResultMap = true)
@ApiModel(value = "应急物资管理对象", description = "应急物资管理对象")
+@EqualsAndHashCode(callSuper = true)
public class MaterialsManage extends BaseEntity implements Serializable {
private static final long serialVersionUID = 1L;
+
+ /**
+ * 防汛年度
+ */
+ private Integer materialsYear;
/**
* 水库id
@@ -86,4 +97,25 @@
@ApiModelProperty(value = "备注")
private String remarks;
+ /**
+ * 合同
+ */
+ @ApiModelProperty(value = "合同")
+ @TableField(value = "contract",typeHandler = FastjsonTypeHandler.class,updateStrategy = FieldStrategy.IGNORED)
+ private Object[] contract;
+
+ /**
+ * 图片
+ */
+ @ApiModelProperty("图片")
+ @TableField(value = "images",typeHandler = FastjsonTypeHandler.class,updateStrategy = FieldStrategy.IGNORED)
+ private Object[] images;
+
+ /**
+ * 入库时间
+ */
+ @ApiModelProperty(value = "入库时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date importTime;
}
--
Gitblit v1.9.3