From c904bb22a132d75cb7f717d5a725b9624bdcf68e Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期二, 22 八月 2023 14:44:30 +0800
Subject: [PATCH] Merge branch 'master' of http://211.149.162.168:8090/r/product/product-server-administration/V2.0.0
---
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