Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-24 7a52cd14e12e5b1053a26ed5a4799da7a09d4b16

 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);

}