Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-04 28b17e7a9b0bd3a8ed545aff4f077fe981db85d2

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



}