Merge branch 'dev'

zhaoxiaohao

2020-11-17 b7265cdd6f3e1fbb0d428c27e5b5e29e34d56953

 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>