From 3ecb43bd5455df7c541d382370c981c4ffa24853 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Fri, 27 Nov 2020 16:13:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/groupProduct.html | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/groupProduct.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/groupProduct.html
index 414aa09..cb35adb 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/groupProduct.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/groupProduct.html
@@ -59,7 +59,11 @@
updateTime = dateUtil.getNowDate();
$('#dateend').val(updateTime);
}
- table.reload('product-table', { where: { createTime: createTime,updateTime: updateTime } });
+ table.reload('product-table', {
+ where: { createTime: createTime,updateTime: updateTime},
+ page: {
+ curr: 1
+ } });
});
});
</script>
\ No newline at end of file
--
Gitblit v1.8.0