From 9403635b1d208eba23750d679c4a8b1aaabca613 Mon Sep 17 00:00:00 2001
From: DongZeLiang <2746733890@qq.com>
Date: Tue, 10 Oct 2023 22:56:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ruoyi/common/core/domain/BaseEntity.java  | 6 ++++++
 ruoyi-generator/src/main/resources/vm/java/domain.java.vm   | 6 +++++-
 .../src/main/java/com/ruoyi/book/domain/BookInfo.java       | 6 +++---
 3 files changed, 14 insertions(+), 4 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 e1d7b08..f24180a 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
@@ -7,6 +7,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.ruoyi.common.core.page.ReqDomain;
 import com.ruoyi.common.utils.StringUtils;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -40,6 +41,7 @@ public class BaseEntity implements Serializable {
      * 创建者
      */
     @TableField(value = "create_by" , fill = FieldFill.INSERT)
+    @ApiModelProperty(hidden=true)
     private Long createBy;
 
     /**
@@ -47,12 +49,14 @@ public class BaseEntity implements Serializable {
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(value = "create_time" , fill = FieldFill.INSERT)
+    @ApiModelProperty(hidden=true)
     private Date createTime;
 
     /**
      * 更新者
      */
     @TableField(value = "update_by" , fill = FieldFill.UPDATE)
+    @ApiModelProperty(hidden=true)
     private Long updateBy;
 
     /**
@@ -60,6 +64,7 @@ public class BaseEntity implements Serializable {
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(value = "update_time" , fill = FieldFill.UPDATE)
+    @ApiModelProperty(hidden=true)
     private Date updateTime;
 
     /**
@@ -67,6 +72,7 @@ public class BaseEntity implements Serializable {
      */
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     @TableField(exist = false)
+    @ApiModelProperty(hidden=true)
     private Map<String, Object> params;
 
     public Map<String, Object> getParams () {
diff --git a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
index bde6e42..fb6a982 100644
--- a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
@@ -62,7 +62,11 @@ public class ${ClassName} extends ${Entity} {
 #if($column.javaField == $pkColumn.javaField)
     @TableId(value = "${pkColumn.javaField}",type = IdType.AUTO)
 #end
-    @ApiModelProperty(name = "${comment}")
+#set($comment='')
+#if($column.isRequired == '1')
+    #set($comment=', required = true')
+#end
+    @ApiModelProperty(name = "${column.columnComment}", value = "${column.columnComment}"$comment)
     private $column.javaType $column.javaField;
 
 #end
diff --git a/ruoyi-system/src/main/java/com/ruoyi/book/domain/BookInfo.java b/ruoyi-system/src/main/java/com/ruoyi/book/domain/BookInfo.java
index b379b20..65f70a4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/book/domain/BookInfo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/book/domain/BookInfo.java
@@ -33,17 +33,17 @@ public class BookInfo extends BaseEntity {
 
     /** 主键 */
     @TableId(value = "id",type = IdType.AUTO)
-    @ApiModelProperty(name = "${comment}")
+    @ApiModelProperty(name = "主键", value = "主键")
     private Long id;
 
     /** 名称 */
     @Excel(name = "名称")
-    @ApiModelProperty(name = "名称")
+    @ApiModelProperty(name = "名称", value = "名称", required = true)
     private String name;
 
     /** 价格 */
     @Excel(name = "价格")
-    @ApiModelProperty(name = "价格")
+    @ApiModelProperty(name = "价格", value = "价格")
     private BigDecimal price;
 
 }