Merge branch 'master' into 2.7.0

648540858

2024-03-28 cf3d98102ae0535c268886802a2cfc65dcdeb167

 src/main/java/com/genersoft/iot/vmp/service/IDeviceAlarmService.java

old mode 100644
new mode 100755