diff --git a/spring-boot-demo-codegen/src/main/resources/template/Controller.java.vm b/spring-boot-demo-codegen/src/main/resources/template/Controller.java.vm
index 18c604c..a557888 100755
--- a/spring-boot-demo-codegen/src/main/resources/template/Controller.java.vm
+++ b/spring-boot-demo-codegen/src/main/resources/template/Controller.java.vm
@@ -1,19 +1,17 @@
-package ${package}import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+package ${package}.${moduleName}.controller;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xkcoding.common.R;
 import com.xkcoding.scaffold.log.annotations.ApiLog;
+import ${package}.${moduleName}.entity.${className};
+import ${package}.${moduleName}.service.${className}Service;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-.${moduleName}.controller;
-    ${package}
-        .${moduleName}.entity.${className};
-    ${package}
-        .${moduleName}.service.${className}Service;
 
 /**
  * <p>
diff --git a/spring-boot-demo-codegen/src/main/resources/template/Entity.java.vm b/spring-boot-demo-codegen/src/main/resources/template/Entity.java.vm
index 77d8590..69ce47a 100755
--- a/spring-boot-demo-codegen/src/main/resources/template/Entity.java.vm
+++ b/spring-boot-demo-codegen/src/main/resources/template/Entity.java.vm
@@ -1,14 +1,15 @@
-package ${package}import com.baomidou.mybatisplus.annotation.TableId;
+package ${package}.${moduleName}.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
-.${moduleName}.entity;
-    #if(${hasBigDecimal})
-    #end
+#if(${hasBigDecimal})
+import java.math.BigDecimal;
+#end
+import java.io.Serializable;
+import java.time.LocalDateTime;
 
 /**
  * <p>