From ce7e6574a1f9942fc090d989b52aceaa11ba8f3e Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 15 四月 2024 21:54:08 +0800
Subject: [PATCH] 1.得分计算部分调整； 2.大屏得分计算；
---
ruoyi-system/src/main/java/com/ruoyi/system/domain/TbBasicDataConfig.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbBasicDataConfig.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbBasicDataConfig.java
index 953d132..105a856 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbBasicDataConfig.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbBasicDataConfig.java
@@ -1,15 +1,19 @@
package com.ruoyi.system.domain;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.enums.CalculateTypeEnum;
import com.ruoyi.common.enums.ShowStatusEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.Date;
import lombok.Data;
import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
/**
* <p>
@@ -22,18 +26,18 @@
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("tb_basic_data_config")
-@ApiModel(value="TbBasicDataConfig对象", description="基础数据配置表")
+@ApiModel(value = "TbBasicDataConfig对象", description = "基础数据配置表")
public class TbBasicDataConfig implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "基础数据配置id")
@TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ private Long id;
@ApiModelProperty(value = "基础数据分类id")
@TableField("basic_data_category_id")
- private Integer basicDataCategoryId;
+ private Long basicDataCategoryId;
@ApiModelProperty(value = "类型名称")
@TableField("type_name")
@@ -65,20 +69,20 @@
private String delFlag;
@ApiModelProperty(value = "创建者")
- @TableField("create_by")
+ @TableField(value = "create_by", fill = FieldFill.INSERT)
private String createBy;
@ApiModelProperty(value = "创建时间")
@TableField(value = "create_time", fill = FieldFill.INSERT)
- private LocalDateTime createTime;
+ private Date createTime;
@ApiModelProperty(value = "创建者")
- @TableField("update_by")
+ @TableField(value = "update_by", fill = FieldFill.INSERT_UPDATE)
private String updateBy;
@ApiModelProperty(value = "创建时间")
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
- private LocalDateTime updateTime;
+ private Date updateTime;
}
--
Gitblit v1.7.1