bug fixed

src/main/java/cn/wisenergy/chnmuseum/party/common/mybatis/BaseMapper.java

+package cn.wisenergy.chnmuseum.party.common.mybatis;
+
+import org.apache.ibatis.annotations.Param;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * mapper 基类接口
+ */
+public interface BaseMapper<T, ID extends Serializable> extends Serializable {
+
+    int delete(@Param("id") ID id);
+
+    int save(T entity);
+
+    int update(T entity);
+
+    T getById(@Param("id") ID id);
+
+    List<T> selectList(T entity);
+}

src/main/java/cn/wisenergy/chnmuseum/party/common/mybatis/CodeGenerator.java

 package cn.wisenergy.chnmuseum.party.common.mybatis;
 
+import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
@@ -163,18 +164,16 @@ public class CodeGenerator {
         // 全局配置
         GlobalConfig gc = new GlobalConfig();
         gc.setOutputDir(projectPath + "/src/main/java");
-
-        //开启 BaseResultMap
-        gc.setBaseResultMap(true);
-        // 主键自增
         gc.setIdType(IdType.ASSIGN_ID);
-        //开启 baseColumnList
+        gc.setBaseResultMap(true);
         gc.setBaseColumnList(true);
         gc.setFileOverride(true);
         gc.setDateType(DateType.TIME_PACK);
+        // 不需要ActiveRecord特性的请改为false
         gc.setActiveRecord(false);
         gc.setSwagger2(true);
-
+        // 是否生成 kotlin 代码
+        gc.setKotlin(false);
         // XML 二级缓存
         gc.setEnableCache(false);
         gc.setAuthor("Danny Lee");
@@ -190,6 +189,7 @@ public class CodeGenerator {
 
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
+        dsc.setDbType(DbType.MYSQL);
         dsc.setUrl("jdbc:mysql://192.168.110.93:3306/chnmuseum-party?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&useSSL=false&serverTimezone=Asia/Shanghai");
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
@@ -320,8 +320,8 @@ public class CodeGenerator {
         injectionConfig.setFileOutConfigList(focList);
 
         TemplateConfig templateConfig = new TemplateConfig();
-        templateConfig.setController("/templates/controller.java.vm");
-        templateConfig.setXml("/templates/mapper.java.vm");
+        templateConfig.setController(null);
+        templateConfig.setXml(null);
         templateConfig.setEntity("/templates/entity.java.vm");
 
         new AutoGenerator()

src/main/java/cn/wisenergy/chnmuseum/party/common/mybatis/MyBaseMapper.java

+package cn.wisenergy.chnmuseum.party.common.mybatis;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.extension.conditions.query.QueryChainWrapper;
+import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
+import com.baomidou.mybatisplus.extension.conditions.update.UpdateChainWrapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 自定义BaseMapper，增加了批量增删改查的方法
+ *
+ * @author Danny Lee
+ * @since 2020年4月2日15:34:17
+ */
+public interface MyBaseMapper<T> extends BaseMapper<T> {
+
+    /**
+     * 以下定义的 4个 method，其中前3个是mybatisPlus内置的选装件（升级到3.3之后才有的），如果要自动填充，@{@code Param}(xx) xx参数名必须是 list/collection/array 3个的其中之一
+     * <p>
+     * 批量插入
+     */
+    int insertBatchSomeColumn(@Param("list") List<T> list);
+
+    /**
+     * 批量更新
+     */
+    int alwaysUpdateSomeColumnById(@Param(Constants.ENTITY) T entity);
+
+    /**
+     * 批量删除
+     */
+    int deleteByIdWithFill(T entity);
+
+    /**
+     * n
+     * 以下定义的 4个 default method,
+     * copy from {@link com.baomidou.mybatisplus.extension.toolkit.ChainWrappers}
+     */
+    default QueryChainWrapper<T> queryChain() {
+        return new QueryChainWrapper<>(this);
+    }
+
+    default LambdaQueryChainWrapper<T> lambdaQueryChain() {
+        return new LambdaQueryChainWrapper<>(this);
+    }
+
+    default UpdateChainWrapper<T> updateChain() {
+        return new UpdateChainWrapper<>(this);
+    }
+
+    default LambdaUpdateChainWrapper<T> lambdaUpdateChain() {
+        return new LambdaUpdateChainWrapper<>(this);
+    }
+
+    //以下为自己自定义method
+    int insertBatch(@Param("list") List<T> list);
+
+}

src/main/java/cn/wisenergy/chnmuseum/party/common/mybatis/MyLogicSqlInjector.java

@@ -22,11 +22,10 @@ public class MyLogicSqlInjector extends DefaultSqlInjector {
         List<AbstractMethod> methodList = super.getMethodList(mapperClass);
         //增加自定义方法
         methodList.add(new InsertBatch());
-        /**
-         * 以下 3 个为内置选装件
-         * 头 2 个支持字段筛选函数
+        /*
+         * 以下3个为内置选装件, 头2个支持字段筛选函数
+         * 例: 不要指定了update填充的字段
          */
-        // 例: 不要指定了 update 填充的字段
         methodList.add(new InsertBatchSomeColumn(i -> i.getFieldFill() != FieldFill.UPDATE));
         methodList.add(new AlwaysUpdateSomeColumnById(t -> !"name".equals(t.getColumn())));
         methodList.add(new LogicDeleteByIdWithFill());

src/main/java/cn/wisenergy/chnmuseum/party/conf/MybatisPlusConfig.java

 package cn.wisenergy.chnmuseum.party.conf;
 
+import cn.wisenergy.chnmuseum.party.common.mybatis.MyLogicSqlInjector;
 import com.baomidou.mybatisplus.annotation.DbType;
-import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer;
 import com.baomidou.mybatisplus.autoconfigure.MybatisPlusProperties;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -15,6 +17,28 @@ import org.springframework.context.annotation.Configuration;
 @EnableConfigurationProperties(MybatisPlusProperties.class)
 public class MybatisPlusConfig {
 
+    /**
+     * mybatis-plus乐观锁插件
+     */
+    @Bean
+    public OptimisticLockerInnerInterceptor optimisticLockerInterceptor() {
+        return new OptimisticLockerInnerInterceptor();
+    }
+
+    @Bean
+    public BlockAttackInnerInterceptor blockAttackInnerInterceptor() {
+        return new BlockAttackInnerInterceptor();
+    }
+
+    /**
+     * 自定义 SqlInjector
+     * 里面包含自定义的全局方法
+     */
+    @Bean
+    public MyLogicSqlInjector myLogicSqlInjector() {
+        return new MyLogicSqlInjector();
+    }
+
     /**
      * 新的分页插件,一缓和二缓遵循mybatis的规则,需要设置 MybatisConfiguration#useDeprecatedExecutor = false 避免缓存出现问题
      */
@@ -25,9 +49,4 @@ public class MybatisPlusConfig {
         return interceptor;
     }
 
-	@Bean
-	public ConfigurationCustomizer configurationCustomizer() {
-		return configuration -> configuration.setUseDeprecatedExecutor(false);
-	}
-
 }

src/main/resources/mapper/AssetMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.wisenergy.chnmuseum.party.mapper.AssetMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.wisenergy.chnmuseum.party.model.Asset">
+        <id column="id" property="id"/>
+        <result column="name" property="name"/>
+        <result column="asset_copyright_owner_id" property="assetCopyrightOwnerId"/>
+        <result column="asset_type_id" property="assetTypeId"/>
+        <result column="thumbnail" property="thumbnail"/>
+        <result column="video_url" property="videoUrl"/>
+        <result column="audit_status" property="auditStatus"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, asset_copyright_owner_id, asset_type_id, thumbnail, video_url, audit_status, create_time, update_time
+    </sql>
+
+</mapper>

src/main/resources/mapper/AssetTypeMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.wisenergy.chnmuseum.party.mapper.AssetTypeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.wisenergy.chnmuseum.party.model.AssetType">
+        <id column="id" property="id"/>
+        <result column="name" property="name"/>
+        <result column="remarks" property="remarks"/>
+        <result column="copyright_owner_id" property="copyrightOwnerId"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, remarks, copyright_owner_id, create_time, update_time
+    </sql>
+
+</mapper>

src/main/resources/mapper/BoardTalkingMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.wisenergy.chnmuseum.party.mapper.BoardTalkingMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.wisenergy.chnmuseum.party.model.BoardTalking">
+        <id column="id" property="id"/>
+        <result column="board_id" property="boardId"/>
+        <result column="real_name" property="realName"/>
+        <result column="comment" property="comment"/>
+        <result column="asset" property="asset"/>
+        <result column="create_time" property="createTime"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, board_id, real_name, comment, asset, create_time
+    </sql>
+
+</mapper>

src/main/resources/mapper/CopyrightOwnerMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.wisenergy.chnmuseum.party.mapper.CopyrightOwnerMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.wisenergy.chnmuseum.party.model.CopyrightOwner">
+        <id column="id" property="id"/>
+        <result column="name" property="name"/>
+        <result column="owner_type" property="ownerType"/>
+        <result column="expire_date_start" property="expireDateStart"/>
+        <result column="expire_date_end" property="expireDateEnd"/>
+        <result column="remarks" property="remarks"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, owner_type, expire_date_start, expire_date_end, remarks, create_time, update_time
+    </sql>
+
+</mapper>

src/main/resources/mapper/CopytightOwnerAssetTypeMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.wisenergy.chnmuseum.party.mapper.CopytightOwnerAssetTypeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.wisenergy.chnmuseum.party.model.CopytightOwnerAssetType">
+        <id column="id" property="id"/>
+        <result column="copyright_owner_id" property="copyrightOwnerId"/>
+        <result column="asset_type_id" property="assetTypeId"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, copyright_owner_id, asset_type_id
+    </sql>
+
+</mapper>

src/main/resources/mapper/CopytightOwnerBoardTypeMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.wisenergy.chnmuseum.party.mapper.CopytightOwnerBoardTypeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.wisenergy.chnmuseum.party.model.CopytightOwnerBoardType">
+        <id column="id" property="id"/>
+        <result column="copyright_owner_id" property="copyrightOwnerId"/>
+        <result column="board_type_id" property="boardTypeId"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, copyright_owner_id, board_type_id
+    </sql>
+
+</mapper>

src/main/resources/mapper/ExhibitionBoardCatMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.wisenergy.chnmuseum.party.mapper.ExhibitionBoardCatMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.wisenergy.chnmuseum.party.model.ExhibitionBoardCat">
+        <id column="id" property="id"/>
+        <result column="name" property="name"/>
+        <result column="copyright_owner" property="copyrightOwner"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="remarks" property="remarks"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, copyright_owner, create_time, update_time, remarks
+    </sql>
+
+</mapper>

src/main/resources/mapper/ExhibitionBoardMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.wisenergy.chnmuseum.party.mapper.ExhibitionBoardMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.wisenergy.chnmuseum.party.model.ExhibitionBoard">
+        <id column="id" property="id"/>
+        <result column="name" property="name"/>
+        <result column="board_copyright_owner_id" property="boardCopyrightOwnerId"/>
+        <result column="exhibition_board_cat_id" property="exhibitionBoardCatId"/>
+        <result column="board_img_url" property="boardImgUrl"/>
+        <result column="board_qrcode_url" property="boardQrcodeUrl"/>
+        <result column="introduction" property="introduction"/>
+        <result column="asset_copyright_owner_id" property="assetCopyrightOwnerId"/>
+        <result column="asset_type" property="assetType"/>
+        <result column="asset_id" property="assetId"/>
+        <result column="guide_audio_url" property="guideAudioUrl"/>
+        <result column="reference_material" property="referenceMaterial"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="audit_status" property="auditStatus"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, board_copyright_owner_id, exhibition_board_cat_id, board_img_url, board_qrcode_url, introduction,
+        asset_copyright_owner_id, asset_type, asset_id, guide_audio_url, reference_material, create_time, update_time,
+        audit_status
+    </sql>
+
+</mapper>

src/main/resources/mapper/LearningContentBoardCatMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.wisenergy.chnmuseum.party.mapper.LearningContentBoardCatMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.wisenergy.chnmuseum.party.model.LearningContentBoardCat">
+        <id column="id" property="id"/>
+        <result column="learning_content_id" property="learningContentId"/>
+        <result column="exhibition_board_cat_id" property="exhibitionBoardCatId"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, learning_content_id, exhibition_board_cat_id
+    </sql>
+
+</mapper>

src/main/resources/mapper/LearningContentBoardMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.wisenergy.chnmuseum.party.mapper.LearningContentBoardMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.wisenergy.chnmuseum.party.model.LearningContentBoard">
+        <id column="id" property="id"/>
+        <result column="learning_content_id" property="learningContentId"/>
+        <result column="exhibition_board_id" property="exhibitionBoardId"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, learning_content_id, exhibition_board_id
+    </sql>
+
+</mapper>

src/main/resources/mapper/LearningContentCopyrightOwnerMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.wisenergy.chnmuseum.party.mapper.LearningContentCopyrightOwnerMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.wisenergy.chnmuseum.party.model.LearningContentCopyrightOwner">
+        <id column="id" property="id"/>
+        <result column="learning_content_id" property="learningContentId"/>
+        <result column="copyright_owner_id" property="copyrightOwnerId"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, learning_content_id, copyright_owner_id
+    </sql>
+
+</mapper>

src/main/resources/mapper/LearningContentMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.wisenergy.chnmuseum.party.mapper.LearningContentMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.wisenergy.chnmuseum.party.model.LearningContent">
+        <id column="id" property="id"/>
+        <result column="name" property="name"/>
+        <result column="avartar" property="avartar"/>
+        <result column="applicable_scope" property="applicableScope"/>
+        <result column="audit_status" property="auditStatus"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, avartar, applicable_scope, audit_status, create_time, update_time
+    </sql>
+
+</mapper>

src/main/resources/mapper/RunLogMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.wisenergy.chnmuseum.party.mapper.RunLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.wisenergy.chnmuseum.party.model.RunLog">
+        <id column="id" property="id"/>
+        <result column="mac_addr" property="macAddr"/>
+        <result column="organ_id" property="organId"/>
+        <result column="learning_content_id" property="learningContentId"/>
+        <result column="start_time" property="startTime"/>
+        <result column="end_time" property="endTime"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, mac_addr, organ_id, learning_content_id, start_time, end_time
+    </sql>
+
+</mapper>

src/main/resources/mapper/SysLogMapper.xml

@@ -3,12 +3,19 @@
 <mapper namespace="cn.wisenergy.chnmuseum.party.mapper.SysLogMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="SysLog">
-        <id column="id" property="id" />
-        <result column="operation_content" property="operationContent" />
-        <result column="operator" property="operator" />
-        <result column="operation_time" property="operationTime" />
-        <result column="operation_ip" property="operationIp" />
+    <resultMap id="BaseResultMap" type="cn.wisenergy.chnmuseum.party.model.SysLog">
+        <id column="id" property="id"/>
+        <result column="operator" property="operator"/>
+        <result column="operation_type" property="operationType"/>
+        <result column="operation_object" property="operationObject"/>
+        <result column="operation_content" property="operationContent"/>
+        <result column="operation_time" property="operationTime"/>
+        <result column="operation_ip" property="operationIp"/>
     </resultMap>
 
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, operator, operation_type, operation_object, operation_content, operation_time, operation_ip
+    </sql>
+
 </mapper>

src/main/resources/templates/mapper.java.vm

@@ -27,7 +27,7 @@ interface ${table.mapperName} : ${superMapperClass}<${entity}>
 public interface ${table.mapperName} extends ${superMapperClass}<${entity}> {
 
     #if(${cfg.generatorStrategy})
-    /**
+    /*
      * 根据ID获取查询对象
      *
      * @param id
@@ -35,7 +35,7 @@ public interface ${table.mapperName} extends ${superMapperClass}<${entity}> {
      */
     ${entity}QueryVo get${entity}ById(Serializable id);
 
-    /**
+    /*
      * 获取分页对象
      *
      * @param page