Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-03 b97887d232f865b6a4bf835861aac8a4ebc55c28

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

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


    PageBean queryByPageBean(PageBean pageBean);



   Integer updateOperateUserCode(OperateUser operateUser);

   Integer updateOperateUser(OperateUser operateUser);

}