Merge remote-tracking branch 'origin/main'

# Conflicts:
#	xsnb-common/pom.xml
#	zhn-auth/target/classes/bootstrap.yml
#	zhn-gateway/src/main/resources/bootstrap.yml
#	zhn-modules/zhn-system/src/main/resources/bootstrap.yml
#	zhn-modules/zhn-system/target/classes/bootstrap.yml
#	zhn-vue-ui/src/api/user.js
main
张海宁 2024-03-27 18:09:57 +08:00
commit 97e9f680b3
1 changed files with 5 additions and 0 deletions

View File

@ -1,6 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="RemoteRepositoriesConfiguration"> <component name="RemoteRepositoriesConfiguration">
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Central Repository" />
<option name="url" value="https://repo.maven.apache.org/maven2" />
</remote-repository>
<remote-repository> <remote-repository>
<option name="id" value="central" /> <option name="id" value="central" />
<option name="name" value="Central Repository" /> <option name="name" value="Central Repository" />