java/xizang.git

			@@ -22,6 +22,7 @@
			import io.swagger.annotations.ApiOperation;
			import org.springframework.beans.BeanUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.security.access.prepost.PreAuthorize;
			import org.springframework.util.CollectionUtils;
			import org.springframework.validation.annotation.Validated;
			import org.springframework.web.bind.annotation.*;
			@@ -56,6 +57,7 @@
			*/
			@ApiOperation(value = "获取用户列表")
			@PostMapping("/list")
			@PreAuthorize("@ss.hasPermi('system:user')")
			public AjaxResult list(@RequestBody SysUserQuery query)
			{
			PageInfo<SysUserVO> list = userService.pageList(query);
			@@ -64,6 +66,8 @@

			@ApiOperation(value = "获取用户列表-不分页")
			@PostMapping("/listNotPage")
			@PreAuthorize("@ss.hasPermi('system:user')")

			public AjaxResult listNotPage()
			{
			List<SysUser> list = userService.selectList();