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

houruijun

2020-07-22 3c470b15b952b86c1e38cb9634190a12ccf3d38d

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

@@ -80,8 +80,8 @@
                    },
                    { align: 'center', width: 100, toolbar: '#product-table-bar', title: '操作' }
                ]],
                done: function () {
                    permissionsInput();
                done: function (res) {
                    permissionsInput(res,config);
                }
            });
        }