Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/GeoHazardMonitor

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/MsgAlarmController.java

@@ -531,7 +531,7 @@ public class MsgAlarmController extends BaseController {
                 }
                 if (!ObjectUtils.isEmpty(l.getAlarmAttr())) {
                     String[] split1 = l.getAlarmAttr().split(",");
-                    String stringBuilder = "画面,大小为" + split1[0] + "×" + split1[1] + "," +
+                    String stringBuilder = "画面大小" + split1[0] + "×" + split1[1] + "," +
                             "泥石流范围为左上角坐标(" + split1[2] + "," + split1[3] + ")" +
                             "大小" + split1[4] + "×" + split1[5];
                     l.setAlarmAttrString(stringBuilder);
@@ -665,7 +665,7 @@ public class MsgAlarmController extends BaseController {
                     }
                     if (!ObjectUtils.isEmpty(l.getAlarmAttr())) {
                         String[] split1 = l.getAlarmAttr().split(",");
-                        String stringBuilder = "画面,大小为" + split1[0] + "×" + split1[1] + "," +
+                        String stringBuilder = "画面大小" + split1[0] + "×" + split1[1] + "," +
                                 "泥石流范围为左上角坐标(" + split1[2] + "," + split1[3] + ")" +
                                 "大小" + split1[4] + "×" + split1[5];
                         l.setAlarmAttrString(stringBuilder);

hazard-admin/src/main/java/com/ozs/web/controller/system/SysDictDataController.java

@@ -93,6 +93,7 @@ public class SysDictDataController extends BaseController {
         if (!ObjectUtils.isEmpty(sysDictDataVo.getStatus())) {
             wrapper.like(SysDictData::getStatus, sysDictDataVo.getStatus());
         }
+            wrapper.orderByAsc(SysDictData::getDictSort);
         IPage<SysDictData> page = dictDataService.page(new Page<>(sysDictDataVo.getPageNum(), sysDictDataVo.getPageSize()), wrapper);
         return AjaxResult.success(page);
     }