被盗修改为防盗

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/enums/ElectricityMeterAttributes.java

@@ -25,7 +25,7 @@ public enum ElectricityMeterAttributes {
     METER_ATTRIBUTES_4("红外告警", null, "{\"0\":\"正常\",\"1\":\"告警\"}"),
     METER_ATTRIBUTES_5("可燃气体告警", null, "{\"0\":\"正常\",\"1\":\"告警\"}"),
     METER_ATTRIBUTES_6("门磁开关状态", null, "{\"0\":\"开门\",\"1\":\"关门\"}"),
-    METER_ATTRIBUTES_7("被盗告警", null, "{\"0\":\"正常\",\"1\":\"告警\"}");
+    METER_ATTRIBUTES_7("防盗告警", null, "{\"0\":\"正常\",\"1\":\"告警\"}");
 
     private String text;
 

soc-modules/soc-modules-core/src/main/resources/mapper/edu/CoreEduTrainingTaskMapper.xml

@@ -107,7 +107,7 @@
                 and t.status=#{request.status}
             </if>
             <include refid="timeRangeSql"/>
-        order by field(t.status,1,4,0,2,3),t.title
+        order by field(t.status,1,4,0,2,3),t.id
     </select>
 
     <select id="selectEduTrainingTaskDetail"