Merge remote-tracking branch 'origin/master'

guyue

2 天以前 b7ff8446a58d59e7df8a588104c231c7af7d8573

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

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

    Page<User> 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);
}