Merge remote-tracking branch 'origin/master'

fengxiang

2018-02-01 af8dd6eccb0aab770246ae44db1cde4e531416c5

 src/main/java/com/moral/controller/OperateUserController.java

@@ -22,7 +22,10 @@
@RestController

@RequestMapping("operateUser")

public class OperateUserController {

 
    @GetMapping("page-list")

    public PageBean pageList(PageBean pageBean) {

        return operateUserService.queryByPageBean(pageBean);

    }

   @Resource

    private OperateUserService operateUserService;