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

zhaoxiaohao

2020-07-15 1ad851e4eb8c972eeb2fee7f2d1d54d3e32068a9

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

@@ -70,8 +70,8 @@
                    return new Date(d.createTime).dateFormat("yyyy-MM-dd hh:mm");
                } },
                { align: 'center', width: 200, toolbar: '#feeedback-table-bar', title: '操作' }
            ]],done:function(){
                permissionsInput();
            ]],done:function(res){
                permissionsInput(res,config);
            }
        });