Merge remote-tracking branch 'origin/master'

huliguo

昨天 23ac3e4f8fb16db0759ba5c91c4d06d622c67009

 src/main/java/com/linghu/mapper/UserMapper.java

@@ -14,7 +14,7 @@
*/
public interface UserMapper extends BaseMapper<User> {

    Page<UserPageVO> getPage(Page<UserPageVO> page, @Param("sectionalizationId") Integer sectionalizationId, @Param("status") String status);
    Page<UserPageVO> getPage(@Param("page") Page<UserPageVO> page, @Param("sectionalizationId") Integer sectionalizationId, @Param("status") String status);
}