Merge branch 'dev1.1' into dev

zhaoxiaohao

2021-03-01 7ea2a2cfe922c9b2d5c09c737d10a7f1ab5b50d1

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

@@ -65,7 +65,7 @@
        $('#product-btn-search').click(function () {
            var monthPar = $('#monthPar').val();
            var aiCountPar = $('#aiCountPar').val();
            table.reload('product-end-table', { where: { monthPar: monthPar, aiCountPar: aiCountPar } });
            table.reload('product-end-table', { where: { monthPar: monthPar, aiCountPar: aiCountPar },page: {curr: 1  } });
        });
        renderTable();
    });