From 4f4d33d750324eb757c5346bf8d5b8b9841ca22a Mon Sep 17 00:00:00 2001
From: wenchaogong <hanyedxing2012@163.com>
Date: Sat, 21 Aug 2021 21:58:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=20tab=20->=204space?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/vm/java/service.java.vm    | 62 +++++++++----------
 .../src/main/resources/vm/java/vo.java.vm     | 16 ++---
 2 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/ruoyi-generator/src/main/resources/vm/java/service.java.vm b/ruoyi-generator/src/main/resources/vm/java/service.java.vm
index 0041c398c..1cba5626b 100644
--- a/ruoyi-generator/src/main/resources/vm/java/service.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/service.java.vm
@@ -18,43 +18,43 @@ import java.util.List;
  * @date ${datetime}
  */
 public interface I${ClassName}Service extends IServicePlus<${ClassName}, ${ClassName}Vo> {
-	/**
-	 * 查询单个
-	 * @return
-	 */
-	${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField});
+    /**
+     * 查询单个
+     * @return
+     */
+    ${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField});
 
 #if($table.crud || $table.sub)
-	/**
-	 * 查询列表
-	 */
+    /**
+     * 查询列表
+     */
     TableDataInfo<${ClassName}Vo> queryPageList(${ClassName}Bo bo);
 #end
 
-	/**
-	 * 查询列表
-	 */
-	List<${ClassName}Vo> queryList(${ClassName}Bo bo);
+    /**
+     * 查询列表
+     */
+    List<${ClassName}Vo> queryList(${ClassName}Bo bo);
 
-	/**
-	 * 根据新增业务对象插入${functionName}
-	 * @param bo ${functionName}新增业务对象
-	 * @return
-	 */
-	Boolean insertByBo(${ClassName}Bo bo);
+    /**
+     * 根据新增业务对象插入${functionName}
+     * @param bo ${functionName}新增业务对象
+     * @return
+     */
+    Boolean insertByBo(${ClassName}Bo bo);
 
-	/**
-	 * 根据编辑业务对象修改${functionName}
-	 * @param bo ${functionName}编辑业务对象
-	 * @return
-	 */
-	Boolean updateByBo(${ClassName}Bo bo);
+    /**
+     * 根据编辑业务对象修改${functionName}
+     * @param bo ${functionName}编辑业务对象
+     * @return
+     */
+    Boolean updateByBo(${ClassName}Bo bo);
 
-	/**
-	 * 校验并删除数据
-	 * @param ids 主键集合
-	 * @param isValid 是否校验,true-删除前校验,false-不校验
-	 * @return
-	 */
-	Boolean deleteWithValidByIds(Collection<${pkColumn.javaType}> ids, Boolean isValid);
+    /**
+     * 校验并删除数据
+     * @param ids 主键集合
+     * @param isValid 是否校验,true-删除前校验,false-不校验
+     * @return
+     */
+    Boolean deleteWithValidByIds(Collection<${pkColumn.javaType}> ids, Boolean isValid);
 }
diff --git a/ruoyi-generator/src/main/resources/vm/java/vo.java.vm b/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
index e97cd2467..16036b582 100644
--- a/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
@@ -25,13 +25,13 @@ import java.util.Date;
 @ExcelIgnoreUnannotated
 public class ${ClassName}Vo {
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	/**
+    /**
      *  $pkColumn.columnComment
      */
-	@ApiModelProperty("$pkColumn.columnComment")
-	private ${pkColumn.javaType} ${pkColumn.javaField};
+    @ApiModelProperty("$pkColumn.columnComment")
+    private ${pkColumn.javaType} ${pkColumn.javaField};
 
 #foreach ($column in $columns)
 #if($column.isList && $column.isPk!=1)
@@ -48,13 +48,13 @@ public class ${ClassName}Vo {
     @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "${column.dictType}")
 #elseif($parentheseIndex != -1)
-	@ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class)
+    @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "$column.readConverterExp()")
 #else
-	@ExcelProperty(value = "${comment}")
+    @ExcelProperty(value = "${comment}")
 #end
-	@ApiModelProperty("$column.columnComment")
-	private $column.javaType $column.javaField;
+    @ApiModelProperty("$column.columnComment")
+    private $column.javaType $column.javaField;
 
 #end
 #end