From ac2e912c9dd7bafc9101775462fbe7060ce27a91 Mon Sep 17 00:00:00 2001
From: zm <2369059705qq.com>
Date: 星期五, 18 十月 2024 16:38:20 +0800
Subject: [PATCH] Merge branch 'dev' of http://nonxin.cn:8090/r/product/product-server-administration/V2.0.0 into dev
---
src/main/java/com/product/administration/service/ReplenishPunchRecordService.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/product/administration/service/ReplenishPunchRecordService.java b/src/main/java/com/product/administration/service/ReplenishPunchRecordService.java
index 4c655ae..66326a3 100644
--- a/src/main/java/com/product/administration/service/ReplenishPunchRecordService.java
+++ b/src/main/java/com/product/administration/service/ReplenishPunchRecordService.java
@@ -40,7 +40,7 @@
if(!StringUtils.isEmpty(dataFilter)){
filter += " and "+dataFilter;
}
- DataTableEntity dt = baseDao.listTable(CmnConst.PRODUCT_SYS_REPLENISH_PUNCH,filter,null,null,null,fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE));
+ DataTableEntity dt = baseDao.listTable(CmnConst.PRODUCT_SYS_REPLENISH_PUNCH,filter,null,null,"replenish_date DESC",fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE));
baseDao.loadPromptData(dt);
return dt;
}
--
Gitblit v1.9.2