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

houruijun

2020-11-27 fbf6a877aae46e19a8d3c0058cefa3f81c72715f

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

@@ -126,7 +126,10 @@
        // 搜索按钮点击事件
        $('#product-btn-search').click(function () {
            var proName = $('#product-search-value').val();
            table.reload('product-table', { where: { proName: proName } });
            table.reload('product-table', { where: { proName: proName},
                page: {
                    curr: 1 
                } });
        });
        // 添加按钮点击事件
        $('#product-btn-add').click(function () {