From 4bdd29d205cdda7c63e03c7dc697f3512a6314c4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 09 十一月 2024 16:43:29 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/page/code/CodeList.jsx | 2 +-
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java | 1 -
2 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/zy-acs-flow/src/page/code/CodeList.jsx b/zy-acs-flow/src/page/code/CodeList.jsx
index d41e9e5..8a8ff9e 100644
--- a/zy-acs-flow/src/page/code/CodeList.jsx
+++ b/zy-acs-flow/src/page/code/CodeList.jsx
@@ -110,7 +110,7 @@
title={"menu.code"}
empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
filters={filters}
- sort={{ field: "create_time", order: "desc" }}
+ sort={{ field: "id", order: "asc" }}
actions={(
<TopToolbar>
<FilterButton />
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java
index 316f116..a1aedb9 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java
@@ -61,7 +61,6 @@
PageResult<AgvResult> page = agvService.pageRel(pageParam);
for (AgvResult result : page.getRecords()) {
result.sync(agvDetailService.selectByAgvId(result.getId()), codeService, taskService, agvService);
- if (result.getUuid().equals("2")) { result.setOnline(true); }
}
return R.ok().add(page);
}
--
Gitblit v1.9.1