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

houruijun

2020-08-09 e84df331a8ee600d369eeac4172b750db563926d

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

@@ -1,6 +1,3 @@



<script>
    layui.use(['layer', 'admin', 'form', 'table', 'config'], function () {
        var table = layui.table;