Merge branch 'refs/heads/master' into release-sy-v1.0.0

shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java

@@ -103,6 +103,7 @@ public class BsSgcDfSafeJbxxController extends BaseController {
                         .eq(data.getStatus() != null, BsSgcDfSafeJbxx::getStatus, data.getStatus())
                         .isNull(BsSgcDfSafeJbxx::getExprDate)
                         .likeRight(data.getAdcd() != null, BsSgcDfSafeJbxx::getAdcd, sysXzqhService.getSubString(data.getAdcd()))
+                        .orderByAsc(BsSgcDfSafeJbxx::getDikeGrad)
                         .orderByDesc(BsSgcDfSafeJbxx::getCreateTime));
 
         return page;

shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java

@@ -64,8 +64,6 @@ public class BsSgcSzSafeJbxxController extends BaseController {
         }
         listBy.add(map);
         return listBy;
-
-
     }
 
     @GetMapping("/getHistogram")
@@ -82,6 +80,8 @@ public class BsSgcSzSafeJbxxController extends BaseController {
     }
 
 
+
+
     /**
      * 查询水闸安全管理基本信息列表
      */