Merge remote-tracking branch 'origin/master'

fengxiang

2018-09-20 a31c81dada74c63ff96c7adf7f21451f1e3ad989

 src/main/java/com/moral/service/OperateUserService.java

@@ -25,4 +25,6 @@
   Integer deleteOperateUsersByLogic(List<Integer> ids);



    PageBean queryByPageBean(PageBean pageBean);



   Integer updateOperateUser(OperateUser operateUser);

}