jun hu 1 anno fa
parent
commit
6395f2de64

+ 0 - 1
.github/FUNDING.yml

@@ -1 +0,0 @@
-custom: http://doc.ruoyi.vip/ruoyi-vue/other/donate.html

File diff suppressed because it is too large
+ 5 - 1
README.md


+ 4 - 1
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java

@@ -4,13 +4,14 @@ import java.io.Serializable;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 /**
  * Entity基类
- * 
+ *
  * @author ruoyi
  */
 public class BaseEntity implements Serializable
@@ -18,6 +19,7 @@ public class BaseEntity implements Serializable
     private static final long serialVersionUID = 1L;
 
     /** 搜索值 */
+    @TableField(exist = false)
     @JsonIgnore
     private String searchValue;
 
@@ -39,6 +41,7 @@ public class BaseEntity implements Serializable
     private String remark;
 
     /** 请求参数 */
+    @TableField(exist = false)
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private Map<String, Object> params;
 

+ 8 - 0
ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm

@@ -3,6 +3,13 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="${packageName}.mapper.${ClassName}Mapper">
+
+    <resultMap type="${ClassName}" id="${ClassName}Result">
+#foreach ($column in $columns)
+        <result property="${column.javaField}"    column="${column.columnName}" />
+#end
+    </resultMap>
+
 #if($table.sub)
     <select id="select${subClassName}By${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}" resultType="${packageName}.domain.${ClassName}">
         select * from ${subTableName} where ${subTableFkName} = #{${pkColumn.javaField}}
@@ -11,5 +18,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <delete id="delete${subClassName}By${subTableFkClassName}" parameterType="${pkColumn.javaType}">
         delete from ${subTableName} where ${subTableFkName} = #{${pkColumn.javaField}}
     </delete>
+
 #end
 </mapper>