From 0375fd319c9f3b08d255c814cb0f8521d8ec641b Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期三, 18 八月 2021 11:11:24 +0800 Subject: [PATCH] !78 同步dev分支 Merge pull request !78 from 疯狂的狮子Li/dev --- ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java | 56 +++++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 39 insertions(+), 17 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java index d66686b..72d624a 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java @@ -1,5 +1,6 @@ package com.ruoyi.common.core.domain; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; @@ -18,29 +19,50 @@ @Data @NoArgsConstructor @Accessors(chain = true) -public class BaseEntity implements Serializable -{ - private static final long serialVersionUID = 1L; +public class BaseEntity implements Serializable { - /** 鎼滅储鍊� */ - private String searchValue; + private static final long serialVersionUID = 1L; - /** 鍒涘缓鑰� */ - private String createBy; + /** + * 鎼滅储鍊� + */ + @ApiModelProperty(value = "鎼滅储鍊�") + private String searchValue; - /** 鍒涘缓鏃堕棿 */ - private Date createTime; + /** + * 鍒涘缓鑰� + */ + @ApiModelProperty(value = "鍒涘缓鑰�") + private String createBy; - /** 鏇存柊鑰� */ - private String updateBy; + /** + * 鍒涘缓鏃堕棿 + */ + @ApiModelProperty(value = "鍒涘缓鏃堕棿") + private Date createTime; - /** 鏇存柊鏃堕棿 */ - private Date updateTime; + /** + * 鏇存柊鑰� + */ + @ApiModelProperty(value = "鏇存柊鑰�") + private String updateBy; - /** 澶囨敞 */ - private String remark; + /** + * 鏇存柊鏃堕棿 + */ + @ApiModelProperty(value = "鏇存柊鏃堕棿") + private Date updateTime; - /** 璇锋眰鍙傛暟 */ - private Map<String, Object> params = new HashMap<>(); + /** + * 澶囨敞 + */ + @ApiModelProperty(value = "澶囨敞") + private String remark; + + /** + * 璇锋眰鍙傛暟 + */ + @ApiModelProperty(value = "璇锋眰鍙傛暟") + private Map<String, Object> params = new HashMap<>(); } -- Gitblit v1.9.3