Merge remote-tracking branch 'origin/master'

fengxiang

2018-02-05 f1e25082a58c8cb57dd45d226d3a94f4af4a0677

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

@@ -12,8 +12,6 @@


   Integer saveOrUpdatealarmUser(AlarmUser alarmUser);



   Integer deletealarmUserByLogic(AlarmUser alarmUser);



   Integer deletealarmUsersByLogic(List<Integer> ids);



}