From 07f3517b6f178efea6150429a3867468b718e3c4 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 08 八月 2022 18:20:29 +0800
Subject: [PATCH] fix 修复 用户登录与短信登录 国际化格式不一致
---
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java | 15 +++------------
1 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java
index 80bf275..2fde8fc 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java
@@ -8,12 +8,11 @@
import com.ruoyi.common.annotation.ExcelDictFormat;
import com.ruoyi.common.convert.ExcelDictConvert;
import com.ruoyi.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
/**
@@ -26,13 +25,11 @@
@EqualsAndHashCode(callSuper = true)
@TableName("sys_post")
@ExcelIgnoreUnannotated
-@ApiModel("宀椾綅淇℃伅涓氬姟瀵硅薄")
public class SysPost extends BaseEntity {
/**
* 宀椾綅搴忓彿
*/
- @ApiModelProperty(value = "宀椾綅搴忓彿")
@ExcelProperty(value = "宀椾綅搴忓彿")
@TableId(value = "post_id")
private Long postId;
@@ -40,7 +37,6 @@
/**
* 宀椾綅缂栫爜
*/
- @ApiModelProperty(value = "宀椾綅缂栫爜")
@ExcelProperty(value = "宀椾綅缂栫爜")
@NotBlank(message = "宀椾綅缂栫爜涓嶈兘涓虹┖")
@Size(min = 0, max = 64, message = "宀椾綅缂栫爜闀垮害涓嶈兘瓒呰繃64涓瓧绗�")
@@ -49,7 +45,6 @@
/**
* 宀椾綅鍚嶇О
*/
- @ApiModelProperty(value = "宀椾綅鍚嶇О")
@ExcelProperty(value = "宀椾綅鍚嶇О")
@NotBlank(message = "宀椾綅鍚嶇О涓嶈兘涓虹┖")
@Size(min = 0, max = 50, message = "宀椾綅鍚嶇О闀垮害涓嶈兘瓒呰繃50涓瓧绗�")
@@ -58,15 +53,13 @@
/**
* 宀椾綅鎺掑簭
*/
- @ApiModelProperty(value = "宀椾綅鎺掑簭")
@ExcelProperty(value = "宀椾綅鎺掑簭")
- @NotBlank(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
- private String postSort;
+ @NotNull(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
+ private Integer postSort;
/**
* 鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
*/
- @ApiModelProperty(value = "鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�")
@ExcelProperty(value = "鐘舵��", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "sys_common_status")
private String status;
@@ -74,13 +67,11 @@
/**
* 澶囨敞
*/
- @ApiModelProperty(value = "澶囨敞")
private String remark;
/**
* 鐢ㄦ埛鏄惁瀛樺湪姝ゅ矖浣嶆爣璇� 榛樿涓嶅瓨鍦�
*/
- @ApiModelProperty(value = "鐢ㄦ埛鏄惁瀛樺湪姝ゅ矖浣嶆爣璇� 榛樿涓嶅瓨鍦�")
@TableField(exist = false)
private boolean flag = false;
--
Gitblit v1.9.3