Merge remote-tracking branch 'origin/master'

fiveep-persistence/src/main/resources/mapper/mysql/AlarmPowerMapper.xml

@@ -68,6 +68,7 @@
                 and ap.soe_time between #{startTime} and #{endTime}
             </if>
         </where>
+        order by field(handling_status,'0','2','3','1','4'),sending_time DESC
     </select>
     <select id="getLoopStatusListMap" resultType="com.bizmatics.model.AlarmPower">
         select