diff --git a/CloudKey/app/src/main/java/com/thankvinci/CloudKey/Files/FileAdapter.java b/CloudKey/app/src/main/java/com/thankvinci/CloudKey/Files/FileAdapter.java
index a2e07fa..a6022fa 100644
--- a/CloudKey/app/src/main/java/com/thankvinci/CloudKey/Files/FileAdapter.java
+++ b/CloudKey/app/src/main/java/com/thankvinci/CloudKey/Files/FileAdapter.java
@@ -87,7 +87,7 @@ public class FileAdapter extends RecyclerView.Adapter<FileAdapter.ViewHolder> {
                             });
                             Bundle data = new Bundle();
                             data.putString("srcFile",srcFile);
-                            data.putString("desPath",desPath);
+                            data.putString("desPath",desPath+"-unzip");
                             unzipDialog.setArguments(data);
                             unzipDialog.show(((MainActivity)v.getContext()).getSupportFragmentManager(),"unzip");
                             //Toast.makeText(v.getContext(),""+unzipDialog.getPosiBtn(),Toast.LENGTH_SHORT).show();
diff --git a/开发历程.md b/开发历程.md
index 5487c31..19127bb 100644
--- a/开发历程.md
+++ b/开发历程.md
@@ -355,4 +355,8 @@ FileHandler负责将获取到的md5码发到NetThread,然后将得到的密码
 
 **2021/6/14**
 
-修复了在获取大文件md5时按返回键或者取消时,返回数据找不到目标控件引起的异常
\ No newline at end of file
+修复了在获取大文件md5时按返回键或者取消时,返回数据找不到目标控件引起的异常
+
+**2021/6/24**
+
+修复了当文件名与解压文件夹命名冲突时解压失败的问题
\ No newline at end of file