update pr优化

ruoyi-generator/src/main/resources/vm/java/addBo.java.vm

@@ -3,6 +3,7 @@ package ${packageName}.bo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import java.util.Date;
 
 
 #foreach ($import in $importList)
@@ -18,7 +19,6 @@ import ${import};
 @Data
 @ApiModel("${functionName}添加对象")
 public class ${ClassName}AddBo {
-    private static final long serialVersionUID = 1L;
 
 #foreach ($column in $columns)
 #if($column.isInsert && $column.isPk!=1)

ruoyi-generator/src/main/resources/vm/java/domain.java.vm

@@ -6,9 +6,8 @@ import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 import java.io.Serializable;
 import java.util.Date;
-import java.util.Map;
-import java.util.HashMap;
 import java.math.BigDecimal;
+import com.ruoyi.common.annotation.Excel;
 
 /**
  * ${functionName}对象 ${tableName}

ruoyi-generator/src/main/resources/vm/java/editBo.java.vm

@@ -3,6 +3,7 @@ package ${packageName}.bo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import java.util.Date;
 
 #foreach ($import in $importList)
 import ${import};
@@ -17,7 +18,6 @@ import ${import};
 @Data
 @ApiModel("${functionName}编辑对象")
 public class ${ClassName}EditBo {
-	private static final long serialVersionUID = 1L;
 
 #foreach ($column in $columns)
 #if($column.isEdit)

ruoyi-generator/src/main/resources/vm/java/queryBo.java.vm

@@ -3,6 +3,9 @@ package ${packageName}.bo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
 
 #foreach ($import in $importList)
 import ${import};
@@ -17,7 +20,7 @@ import ${import};
 @Data
 @ApiModel("${functionName}分页查询对象")
 public class ${ClassName}QueryBo {
-	private static final long serialVersionUID = 1L;
+
 	/** 分页大小 */
 	@ApiModelProperty("分页大小")
 	private Integer pageSize;
@@ -39,4 +42,7 @@ public class ${ClassName}QueryBo {
 	private $column.javaType $column.javaField;
 #end
 #end
+
+	@TableField(exist = false)
+	private Map<String, Object> params = new HashMap<>();
 }

ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm

@@ -1,11 +1,11 @@
 package ${packageName}.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import org.apache.commons.lang3.StringUtils;
 import ${packageName}.bo.${ClassName}AddBo;
 import ${packageName}.bo.${ClassName}QueryBo;
 import ${packageName}.bo.${ClassName}EditBo;
@@ -47,13 +47,13 @@ public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${C
 #set($mpMethod=$column.queryType.toLowerCase())
 #if($queryType != 'BETWEEN')
 #if($javaType == 'String')
-#set($condition='StringUtils.isNotBlank(bo.get'+$AttrName+'())')
+#set($condition='StrUtil.isNotBlank(bo.get'+$AttrName+'())')
 #else
 #set($condition='bo.get'+$AttrName+'() != null')
 #end
         lqw.$mpMethod($condition, ${ClassName}::get$AttrName, bo.get$AttrName());
 #else
-        Map<String, Object> params = ${className}.getParams();
+        Map<String, Object> params = bo.getParams();
         if (params.get("begin$AttrName") != null && params.get("end$AttrName") != null) {
             lqw.between(${ClassName}::get$AttrName ,params.get("begin$AttrName"), params.get("end$AttrName"));
         }

ruoyi-generator/src/main/resources/vm/java/vo.java.vm

@@ -8,6 +8,7 @@ import ${import};
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import java.util.Date;
 
 
 

ruoyi-system/pom.xml

@@ -23,6 +23,11 @@
             <artifactId>ruoyi-common</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-spring-boot-starter</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>