Merge pull request #54 from gaohanghang/master

 更新mybatis模板，将其中的繁体中文改为简体中文

Author: moshowgame

generator-web/src/main/resources/templates/code-generator/mybatis/controller.ftl

@@ -51,7 +51,7 @@ public class ${classInfo.className}Controller {
     }
 
     /**
-    * [查詢] 根據主鍵 id 查詢
+    * [查询] 根据主键 id 查询
     * @author ${authorName}
     * @date ${.now?string('yyyy/MM/dd')}
     **/
@@ -61,7 +61,7 @@ public class ${classInfo.className}Controller {
     }
 
     /**
-    * [查詢] 分頁查詢
+    * [查询] 分页查询
     * @author ${authorName}
     * @date ${.now?string('yyyy/MM/dd')}
     **/

generator-web/src/main/resources/templates/code-generator/mybatis/mapper.ftl

@@ -1,57 +1,57 @@
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-import java.util.List;
-
-/**
-* ${classInfo.classComment}
-* @author ${authorName}
-* @date ${.now?string('yyyy/MM/dd')}
-*/
-@Mapper
-@Repository
-public interface ${classInfo.className}Mapper {
-
-    /**
-    * [新增]
-    * @author ${authorName}
-    * @date ${.now?string('yyyy/MM/dd')}
-    **/
-    int insert(${classInfo.className} ${classInfo.className?uncap_first});
-
-    /**
-    * [刪除]
-    * @author ${authorName}
-    * @date ${.now?string('yyyy/MM/dd')}
-    **/
-    int delete(int id);
-
-    /**
-    * [更新]
-    * @author ${authorName}
-    * @date ${.now?string('yyyy/MM/dd')}
-    **/
-    int update(${classInfo.className} ${classInfo.className?uncap_first});
-
-    /**
-    * [查詢] 根據主鍵 id 查詢
-    * @author ${authorName}
-    * @date ${.now?string('yyyy/MM/dd')}
-    **/
-    ${classInfo.className} load(int id);
-
-    /**
-    * [查詢] 分頁查詢
-    * @author ${authorName}
-    * @date ${.now?string('yyyy/MM/dd')}
-    **/
-    List<${classInfo.className}> pageList(int offset,int pagesize);
-
-    /**
-    * [查詢] 分頁查詢 count
-    * @author ${authorName}
-    * @date ${.now?string('yyyy/MM/dd')}
-    **/
-    int pageListCount(int offset,int pagesize);
-
-}
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+import java.util.List;
+
+/**
+* ${classInfo.classComment}
+* @author ${authorName}
+* @date ${.now?string('yyyy/MM/dd')}
+*/
+@Mapper
+@Repository
+public interface ${classInfo.className}Mapper {
+
+    /**
+    * [新增]
+    * @author ${authorName}
+    * @date ${.now?string('yyyy/MM/dd')}
+    **/
+    int insert(${classInfo.className} ${classInfo.className?uncap_first});
+
+    /**
+    * [刪除]
+    * @author ${authorName}
+    * @date ${.now?string('yyyy/MM/dd')}
+    **/
+    int delete(int id);
+
+    /**
+    * [更新]
+    * @author ${authorName}
+    * @date ${.now?string('yyyy/MM/dd')}
+    **/
+    int update(${classInfo.className} ${classInfo.className?uncap_first});
+
+    /**
+    * [查询] 根据主键 id 查询
+    * @author ${authorName}
+    * @date ${.now?string('yyyy/MM/dd')}
+    **/
+    ${classInfo.className} load(int id);
+
+    /**
+    * [查询] 分页查询
+    * @author ${authorName}
+    * @date ${.now?string('yyyy/MM/dd')}
+    **/
+    List<${classInfo.className}> pageList(int offset,int pagesize);
+
+    /**
+    * [查询] 分页查询 count
+    * @author ${authorName}
+    * @date ${.now?string('yyyy/MM/dd')}
+    **/
+    int pageListCount(int offset,int pagesize);
+
+}

generator-web/src/main/resources/templates/code-generator/mybatis/service.ftl

@@ -23,7 +23,7 @@ public interface ${classInfo.className}Service {
     public ReturnT<String> update(${classInfo.className} ${classInfo.className?uncap_first});
 
     /**
-    * 根據主鍵 id 查詢
+    * 根据主键 id 查询
     */
     public ${classInfo.className} load(int id);