diff --git a/application/admin/controller/special/Subject.php b/application/admin/controller/special/Subject.php
index 1825485a..7bfcd392 100755
--- a/application/admin/controller/special/Subject.php
+++ b/application/admin/controller/special/Subject.php
@@ -101,7 +101,7 @@ class Subject extends AuthController
         if ($id) {
             $cate = SpecialSubject::get($id);
             if (!$cate['grade_id'] && $post['grade_id'] && SpecialSubject::be(['grade_id' => $id, 'is_del' => 0])) return Json::fail('无法移动有下级的分类');
-            if (SpecialSubject::where(['name' => $post['name'], 'is_del' => 0])->where('id', '<>', $id)->count() >= 1) return Json::fail('分类名称已存在');
+            // if (SpecialSubject::where(['name' => $post['name'], 'is_del' => 0])->where('id', '<>', $id)->count() >= 1) return Json::fail('分类名称已存在');
             $res = SpecialSubject::edit($post, $id);
             if ($res)
                 return Json::successful('修改成功');
diff --git a/public/.DS_Store b/public/.DS_Store
index 6d5019a3..af058c4f 100755
Binary files a/public/.DS_Store and b/public/.DS_Store differ
diff --git a/public/static/frontend/logo.jpg b/public/static/frontend/logo.jpg
old mode 100755
new mode 100644
index 0abddc30..0d198703
Binary files a/public/static/frontend/logo.jpg and b/public/static/frontend/logo.jpg differ