From 7ea2a2cfe922c9b2d5c09c737d10a7f1ab5b50d1 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Mon, 01 Mar 2021 14:14:35 +0800
Subject: [PATCH] Merge branch 'dev1.1' into dev

---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/businessRecords.html |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/businessRecords.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/businessRecords.html
index 9b279da..17b71bd 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/businessRecords.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/businessRecords.html
@@ -8,7 +8,7 @@
     </div>
     <div class="layui-card-body">
         <div class="layui-form toolbar">
-            <input id="app-edit-search" class="layui-input search-input" type="text" placeholder="按内容模糊查找..." />&emsp;
+            <input id="app-edit-search" class="layui-input search-input" type="text" placeholder="按内容模糊查找" />&emsp;
             <input type="text" class="layui-input search-input" id="test1" placeholder="开始时间"> 至 <input type="text"
                 class="layui-input search-input" id="test2"  placeholder="结束时间"> &emsp;
             <button id="app-btn-search" class="layui-btn icon-btn"><i class="layui-icon">&#xe615;</i>搜索</button>
@@ -69,7 +69,7 @@
                 }
             }
 
-            table.reload('app-table', { where: { recordTitle: key, startTime: startTime, endTime: endTime} });
+            table.reload('app-table', { where: { recordTitle: key, startTime: startTime, endTime: endTime},page: {curr: 1  } });
         });
         //比较日期大小
         function compareDate(logintime, logouttime) {

--
Gitblit v1.8.0