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

houruijun

2020-07-22 3c470b15b952b86c1e38cb9634190a12ccf3d38d

 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;
@@ -15,7 +12,6 @@
        {
            //诊断记录ID
            var id=diagnosis.diagnosticId;

        }
    });
</script>