From df908abc9be603406c67d1474d160e3144da38cd Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期六, 27 九月 2025 16:40:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/qlasrs-sxk' into qlasrs-sxk
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 13 -------------
1 files changed, 0 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 91e3add..5a9fba3 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -64,7 +64,6 @@
if (!Cools.isEmpty(orderByField)) {
wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
}
- wrapper.orderBy("loc_attribute",false);
return R.ok(locMastService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -211,18 +210,6 @@
return R.parse(BaseRes.REPEAT).add(getComment(LocMast.class, String.valueOf(param.get("key"))));
}
return R.ok();
- }
-
- @GetMapping(value = "/locMast/check/column/group1")
- public void group1() {
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1",9));
- for (LocMast locMast : locMasts) {
- LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1",8).eq("bay1",locMast.getBay1()).eq("lev1",locMast.getLev1()));
- locMast1.setGroup1(locMast.getGroup1());
- locMastService.updateById(locMast1);
- }
-
-
}
@RequestMapping(value = "/locMast/init/auth")
--
Gitblit v1.9.1