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

blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchiveFileAutoController.java

@@ -109,7 +109,9 @@ ArchiveFileAutoController extends BladeController {
                     }
 
                     //新增不排序
-                    //archive.setAutoFileSort(archive.getAutoFileSort());
+                    archive.setAutoFileSort(null);
+
+                    //修改提不上去
                     //待修改
                     archive.setIsDeleted(0);
                     archive.setIsArchive(1);