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

luliqiang

2020-08-27 c49b95fc3576f9a5dad5bcaa6874157d5091f6e0

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

@@ -69,7 +69,7 @@
                { field: 'createTime', width: 200, title: '创建时间',templet:function(d){
                    return new Date(d.createTime).dateFormat("yyyy-MM-dd hh:mm");
                } },
                { align: 'center', width: 200, toolbar: '#feeedback-table-bar', title: '操作' }
                { align: 'center', width: 150, toolbar: '#feeedback-table-bar', title: '操作',fixed: 'right' }
            ]],done:function(res){
                permissionsInput(res,config);
            }