mybatis代码生成模板修改

security-center/src/main/resources/freemarker/baseMapper.xml.ftl

@@ -12,15 +12,15 @@
     <resultMap id="BaseResultMap" type="${package.Entity}.${entity}">
 <#list table.fields as field>
 <#if field.keyFlag><#--生成主键排在第一位-->
-        <id column="${field.name}" property="${field.propertyName}" />
+        <id column="${field.name}" property="${field.propertyName}"/>
 </#if>
 </#list>
 <#list table.commonFields as field><#--生成公共字段 -->
-    <result column="${field.name}" property="${field.propertyName}" />
+    <result column="${field.name}" property="${field.propertyName}"/>
 </#list>
 <#list table.fields as field>
 <#if !field.keyFlag><#--生成普通字段 -->
-        <result column="${field.name}" property="${field.propertyName}" />
+        <result column="${field.name}" property="${field.propertyName}"/>
 </#if>
 </#list>
     </resultMap>

security-center/src/main/resources/freemarker/entity.java.ftl

@@ -1,18 +1,22 @@
 package ${package.Entity};
 
-<#list table.importPackages as pkg>
+<#list (table.importPackages)?sort as pkg>
+<#if !pkg?contains('java.')>
 import ${pkg};
-</#list>
-<#if swagger2>
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 </#if>
+</#list>
 <#if entityLombokModel>
 import lombok.Data;
 <#--import lombok.EqualsAndHashCode;-->
-import lombok.experimental.Accessors;
+<#--import lombok.experimental.Accessors;-->
 </#if>
 
+<#list (table.importPackages)?sort as pkg>
+<#if pkg?contains('java.')>
+import ${pkg};
+</#if>
+</#list>
+
 /**
  * <p>
  * ${table.comment!}
@@ -28,7 +32,7 @@ import lombok.experimental.Accessors;
     <#--<#else>-->
 <#--@EqualsAndHashCode(callSuper = false)-->
     <#--</#if>-->
-@Accessors(chain = true)
+<#--@Accessors(chain = true)-->
 </#if>
 <#if table.convert>
 @TableName("${table.name}")

security-center/src/main/resources/freemarker/facade.java.ftl

@@ -2,6 +2,7 @@ package ${package.Controller};
 
 import ${package.ServiceImpl}.${table.serviceImplName};
 import org.springframework.stereotype.Component;
+
 /**
  * <p>
  * ${table.comment!} 服务实现类Facade

security-center/src/main/resources/freemarker/mapper.java.ftl

@@ -1,7 +1,7 @@
 package ${package.Mapper};
 
-import ${package.Entity}.${entity};
 import ${superMapperClassPackage};
+import ${package.Entity}.${entity};
 
 /**
  * <p>

security-center/src/main/resources/freemarker/service.java.ftl

@@ -1,7 +1,7 @@
 package ${package.Service};
 
-import ${package.Entity}.${entity};
 import ${superServiceClassPackage};
+import ${package.Entity}.${entity};
 
 /**
  * <p>

security-center/src/main/resources/freemarker/serviceImpl.java.ftl

@@ -1,9 +1,9 @@
 package ${package.ServiceImpl};
 
+import ${superServiceImplClassPackage};
 import ${package.Entity}.${entity};
 import ${package.Mapper}.${table.mapperName};
 import ${package.Service}.${table.serviceName};
-import ${superServiceImplClassPackage};
 import org.springframework.stereotype.Service;
 
 /**