Merge branch 'wangh_branch' of https://bdgit.educoder.net/puhw8ejfm/project into wangh_branch

# Conflicts:
#	src/demo/src/main/java/com/example/demo/config/SpringDocConfig.java

src/demo/src/main/java/com/example/demo/config/SpringDocConfig.java

@@ -1,3 +1,4 @@
+
 package com.example.demo.config;
 
 import io.swagger.v3.oas.models.ExternalDocumentation;