From d8ba5dda56e0065874e9ed707e875732b3af7995 Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期二, 23 五月 2023 15:28:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
home-server-admin/src/main/java/com/home/xining/service/OfficeExpensesService.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/home-server-admin/src/main/java/com/home/xining/service/OfficeExpensesService.java b/home-server-admin/src/main/java/com/home/xining/service/OfficeExpensesService.java
index bc1804d..157913c 100644
--- a/home-server-admin/src/main/java/com/home/xining/service/OfficeExpensesService.java
+++ b/home-server-admin/src/main/java/com/home/xining/service/OfficeExpensesService.java
@@ -81,7 +81,7 @@
filter += " and "+dataFilter;
}
}
- DataTableEntity dt = baseDao.listTable(CmnConst.BGYPLYB,filter,null,null,null,fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE));
+ DataTableEntity dt = baseDao.listTable(CmnConst.BGYPLYB,filter,null,null," bg00 desc ",fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE));
baseDao.loadPromptData(dt);
return dt;
}
--
Gitblit v1.9.2