Merge pull request #1 from dhcdht/develop

添加了搜索和编辑窗口