From bdef23946e420ba538870d6314034fbd42f00a66 Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期三, 27 十一月 2024 18:38:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/domain/entity/ProjectInfo.java | 33 +++++++++++----------------------
1 files changed, 11 insertions(+), 22 deletions(-)
diff --git a/business/src/main/java/com/ycl/domain/entity/ProjectInfo.java b/business/src/main/java/com/ycl/domain/entity/ProjectInfo.java
index 59e77c5..d5eec5c 100644
--- a/business/src/main/java/com/ycl/domain/entity/ProjectInfo.java
+++ b/business/src/main/java/com/ycl/domain/entity/ProjectInfo.java
@@ -1,12 +1,13 @@
package com.ycl.domain.entity;
+import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ycl.system.domain.base.AbsEntity;
import lombok.Data;
import java.math.BigDecimal;
-import java.time.LocalDateTime;
+import java.util.Date;
/**
* 椤圭洰绠＄悊鍩虹淇℃伅琛�
@@ -58,11 +59,11 @@
@TableField("competent_department")
/** 涓荤閮ㄩ棬(瀵瑰簲瀹℃壒閮ㄩ棬id) */
- private Integer competentDepartment;
+ private String competentDepartment;
- @TableField("area_code")
+ @TableField("area")
/** 琛屾斂鍖哄煙 */
- private String areaCode;
+ private String area;
@TableField("management_centralization")
/** 绠＄悊褰掑彛 (0鍩烘湰寤鸿(鍙戞敼), 1鏇存柊鏀归��(缁忎俊), 2鍗曠函璐疆(鍙戞敼), 3淇℃伅鍖�(鍙戞敼), 4鍏朵粬鎶曡祫) */
@@ -71,10 +72,6 @@
@TableField("project_approval_type")
/** 椤圭洰瀹℃壒绫诲瀷 */
private String projectApprovalType;
-
- @TableField("investment_catalogue")
- /** 鎶曡祫鐩綍(锛�) */
- private String investmentCatalogue;
@TableField("importance_type")
/** 閲嶇偣鍒嗙被 (0鐪侀噸鐐归」鐩�, 1閬傚畞甯傞噸鐐归」鐩�, 2.灏勬椽甯傞噸鐐归」鐩�, 3.涓�鑸」鐩�) */
@@ -90,15 +87,15 @@
@TableField("create_project_time")
/** 绔嬮」鏃堕棿 */
- private LocalDateTime createProjectTime;
+ private Date createProjectTime;
@TableField("plan_start_time")
/** 璁″垝寮�宸ユ椂闂� */
- private LocalDateTime planStartTime;
+ private Date planStartTime;
@TableField("plan_complete_time")
/** 璁″垝绔ｅ伐鏃堕棿 */
- private LocalDateTime planCompleteTime;
+ private Date planCompleteTime;
@TableField("win_unit")
/** 涓爣鍗曚綅 */
@@ -110,7 +107,7 @@
@TableField("win_time")
/** 涓爣鏃堕棿 */
- private LocalDateTime winTime;
+ private Date winTime;
@TableField("project_address")
/** 璇︾粏鍦板潃 */
@@ -136,19 +133,11 @@
/** 鑱旂郴鏂瑰紡 */
private String contact;
- @TableField("gmt_create_time")
- /** 鍒涘缓鏃堕棿 */
- private LocalDateTime gmtCreateTime;
-
- @TableField("gmt_update_time")
- /** 鏇存柊鏃堕棿 */
- private LocalDateTime gmtUpdateTime;
-
- @TableField("update_by")
+ @TableField(value = "update_by",fill = FieldFill.INSERT_UPDATE)
/** 鏇存柊浜� */
private Long updateBy;
- @TableField("create_by")
+ @TableField(value = "create_by",fill = FieldFill.INSERT)
/** 鍒涘缓浜� */
private Long createBy;
--
Gitblit v1.8.0