Merge branch 'pre'

src/main/resources/sqlScript/视图信息.sql

@@ -67,7 +67,8 @@ LEFT JOIN room t45 ON t45.id = t44.room_id
 WHERE t1.delete_mark = 0 
 AND t1.delete_mark = 0 
 AND t2.delete_mark = 0 
-AND t3.delete_mark = 0 
+AND t3.delete_mark = 0
+AND t5.delete_mark = 0
 AND t3.archives_status = 'FB2901';