From e2bcd943f56b45d95b949f7b91081e1f27f22060 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 13 九月 2022 18:19:48 +0800
Subject: [PATCH] fix 修复 用户导入存在则更新不生效
---
ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoBo.java | 55 ++++++++++---------------------------------------------
1 files changed, 10 insertions(+), 45 deletions(-)
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoBo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoBo.java
index 46018b1..54ecae1 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoBo.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoBo.java
@@ -1,16 +1,13 @@
package com.ruoyi.demo.domain.bo;
+import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
-import java.util.Date;
-
-import com.ruoyi.common.core.domain.BaseEntity;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
/**
* 娴嬭瘯鍗曡〃涓氬姟瀵硅薄 test_demo
@@ -21,74 +18,42 @@
@Data
@EqualsAndHashCode(callSuper = true)
-@ApiModel("娴嬭瘯鍗曡〃涓氬姟瀵硅薄")
public class TestDemoBo extends BaseEntity {
/**
* 涓婚敭
*/
- @ApiModelProperty("涓婚敭")
- @NotNull(message = "涓婚敭涓嶈兘涓虹┖", groups = { EditGroup.class })
+ @NotNull(message = "涓婚敭涓嶈兘涓虹┖", groups = {EditGroup.class})
private Long id;
/**
* 閮ㄩ棬id
*/
- @ApiModelProperty("閮ㄩ棬id")
- @NotNull(message = "閮ㄩ棬id涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class })
+ @NotNull(message = "閮ㄩ棬id涓嶈兘涓虹┖", groups = {AddGroup.class, EditGroup.class})
private Long deptId;
/**
* 鐢ㄦ埛id
*/
- @ApiModelProperty("鐢ㄦ埛id")
- @NotNull(message = "鐢ㄦ埛id涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class })
+ @NotNull(message = "鐢ㄦ埛id涓嶈兘涓虹┖", groups = {AddGroup.class, EditGroup.class})
private Long userId;
/**
* 鎺掑簭鍙�
*/
- @ApiModelProperty("鎺掑簭鍙�")
- @NotNull(message = "鎺掑簭鍙蜂笉鑳戒负绌�", groups = { AddGroup.class, EditGroup.class })
- private Long orderNum;
+ @NotNull(message = "鎺掑簭鍙蜂笉鑳戒负绌�", groups = {AddGroup.class, EditGroup.class})
+ private Integer orderNum;
/**
* key閿�
*/
- @ApiModelProperty("key閿�")
- @NotBlank(message = "key閿笉鑳戒负绌�", groups = { AddGroup.class, EditGroup.class })
+ @NotBlank(message = "key閿笉鑳戒负绌�", groups = {AddGroup.class, EditGroup.class})
private String testKey;
/**
* 鍊�
*/
- @ApiModelProperty("鍊�")
- @NotBlank(message = "鍊间笉鑳戒负绌�", groups = { AddGroup.class, EditGroup.class })
+ @NotBlank(message = "鍊间笉鑳戒负绌�", groups = {AddGroup.class, EditGroup.class})
private String value;
-
-
- /**
- * 鍒嗛〉澶у皬
- */
- @ApiModelProperty("鍒嗛〉澶у皬")
- private Integer pageSize;
-
- /**
- * 褰撳墠椤垫暟
- */
- @ApiModelProperty("褰撳墠椤垫暟")
- private Integer pageNum;
-
- /**
- * 鎺掑簭鍒�
- */
- @ApiModelProperty("鎺掑簭鍒�")
- private String orderByColumn;
-
- /**
- * 鎺掑簭鐨勬柟鍚慸esc鎴栬�卆sc
- */
- @ApiModelProperty(value = "鎺掑簭鐨勬柟鍚�", example = "asc,desc")
- private String isAsc;
}
--
Gitblit v1.9.3