wen 37653fefd2 Merge branch 'development' into master ...

# Conflicts:
#	xhpc-modules/xhpc-charging-station/src/main/resources/bootstrap.yml
#	xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/XhpcSmsServiceImpl.java

2021-11-30 15:39:42 +08:00

..

src/main

Merge branch 'development' into master

2021-11-30 15:39:42 +08:00

pom.xml

Adding a dependencies

2021-11-16 16:12:31 +08:00