From 4403a428edc18482c5aa561e603b26ebe13d328f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 02 四月 2024 18:27:02 +0800
Subject: [PATCH] 部门端登录、基础数据导入优化、得分计算优化
---
ruoyi-system/src/main/java/com/ruoyi/system/dto/FieldDTO.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/FieldDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/FieldDTO.java
index caa97ee..3bfef1b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/dto/FieldDTO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/FieldDTO.java
@@ -1,5 +1,7 @@
package com.ruoyi.system.dto;
+import com.ruoyi.common.enums.FieldInputTypeEnum;
+import com.ruoyi.common.enums.FieldTypeEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -22,19 +24,19 @@
@NotBlank(message="字段名不能为空")
private String fieldName;
- @ApiModelProperty(value = "字段类型（1=数字 2=文本 3=百分比）")
+ @ApiModelProperty(value = "字段类型（1=数字 2=文本 3=百分比）直接传文字")
@NotNull(message="字段类型不能为空")
- private Integer fieldType;
+ private FieldTypeEnum fieldType;
@ApiModelProperty(value = "一级分类id")
@NotNull(message="分类id不能为空")
- private Integer levelOneCategoryId;
+ private Long levelOneCategoryId;
@ApiModelProperty(value = "二级分类id")
- private Integer levelTwoCategoryId;
+ private Long levelTwoCategoryId;
@ApiModelProperty(value = "三级分类id")
- private Integer levelThreeCategoryId;
+ private Long levelThreeCategoryId;
@ApiModelProperty(value = "数字最小值")
private Integer numMin;
@@ -42,8 +44,8 @@
@ApiModelProperty(value = "数字最大值")
private Integer numMax;
- @ApiModelProperty(value = "文本输入类型（1=手动输入 2=固定内容）")
- private Integer textInputType;
+ @ApiModelProperty(value = "文本输入类型（1=手动输入 2=固定内容）直接传文字")
+ private FieldInputTypeEnum textInputType;
@ApiModelProperty(value = "文本最少字数")
private Integer textMinNum;
--
Gitblit v1.7.1