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

src/main/java/cn/palmte/work/service/AccountService.java

@@ -492,14 +492,14 @@ public class AccountService {
 
         while (1 != record.getInt("level")) {
             //不是一级 往上找
-            record = getDept(record.getInt("parnter_id"));
+            record = getDept(record.getInt("parent_id"));
         }
 
         return record.getInt("manager_id");
     }
 
     private Record getDept(int deptId) {
-        String sql = "SELECT level, manager_id, parnter_id from dept  where id=?";
+        String sql = "SELECT level, manager_id, parent_id from dept  where id=?";
         return pagination.findFirst(sql, deptId);
     }
 }