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

zhaoxiaohao

2020-07-15 1ad851e4eb8c972eeb2fee7f2d1d54d3e32068a9

 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;