Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificAlarmServiceImpl.java

@@ -199,7 +199,7 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
 
     @Override
     public org.springframework.data.domain.Page<AlarmListDataVO> listAlarmsPage(CommonPageInfoParam param) {
-        Page page = new Page(param.getPageNumber(), param.getPageSize());
+        Page page = new Page(param.getPageNumber()-1,(param.getPageNumber()-1) * param.getPageSize());
         Page<Map<String, Object>> mybatisResult = this.baseMapper.pageAlarmsInfo(page, param);
         List<AlarmListDataVO> res = new ArrayList<>();
         if (mybatisResult.getSize() > 0) {