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

luliqiang

2021-02-26 e7c3314727fc06444689c0e6ecab5fea337afeb0

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

@@ -35,7 +35,7 @@
        var renderTable = function () {
            table.render({
                elem: '#product-table',
                url: config.base_server + 'api-opration/productorderdetail/group',
                url: config.base_server + 'api-opration/productorderrecord/group',
                method: 'GET',
                headers: { 'Authorization': 'Bearer ' + config.getToken().access_token },
                page: true,
@@ -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>