Merge branch 'lhr'

# Conflicts:
#	.gitignore

.gitignore

@@ -10,5 +10,6 @@ logs/jeecgboot-2023-11-03.0.html
 logs/jeecgboot-2023-11-03.0.log
 logs/jeecgboot-2023-11-04.0.log
 logs/jeecgboot-2023-11-04.0.html
+<<<<<<< HEAD
 logs/jeecgboot-2023-11-07.0.log
 logs/jeecgboot-2023-11-07.0.html