Merge branch 'dev1.1' into dev

zhaoxiaohao

2021-03-01 7ea2a2cfe922c9b2d5c09c737d10a7f1ab5b50d1

 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);
            }
@@ -150,7 +150,7 @@
                dateend = dateUtil.getNowDate();
                $('#dateend').val(dateend);
            }
            table.reload('feedback-table', { where: { doctorName: doctorName, createTime: datebegin, updateTime: dateend } });
            table.reload('feedback-table', { where: { doctorName: doctorName, createTime: datebegin, updateTime: dateend },page: {curr: 1  } });
        });
    });
</script>