Merge remote-tracking branch 'origin/dev' into dev

houruijun

2020-11-27 3ecb43bd5455df7c541d382370c981c4ffa24853

 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html

@@ -222,7 +222,7 @@
                }
            }

            table.reload('app-table', { where: { doctorName: key, needBegintime: needBegintime, needEndtime: needEndtime } });
            table.reload('app-table', { where: { doctorName: key, needBegintime: needBegintime, needEndtime: needEndtime },page: {curr: 1  }  });
        });
        //比较日期大小
        function compareDate(logintime, logouttime) {