Merge remote-tracking branch 'origin/master'

fengxiang

2018-08-17 2d0b1b3da347f201cfe608e426fb2b7fdb9629a7

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

@@ -26,5 +26,5 @@


    PageBean queryByPageBean(PageBean pageBean);



   Integer updateOperateUserCode(OperateUser operateUser);

   Integer updateOperateUser(OperateUser operateUser);

}