You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
wxz
e9a9e34f68
Merge branch 'dev_jcet' into dev
# Conflicts:
# epmet-auth/src/main/java/com/epmet/controller/SsoController.java
# epmet-auth/src/main/java/com/epmet/service/SsoService.java
# epmet-auth/src/main/java/com/epmet/service/impl/SsoServiceImpl.java
# epmet-auth/src/main/resources/bootstrap.yml
# epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/apiservice/jcet/JcetApiService.java
# epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/properties/ThirdplatProps.java
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java
|
5 years ago |
.. |
src/main
|
Merge branch 'dev_jcet' into dev
|
5 years ago |
pom.xml
|
部署通知 添加 服务版本号的获取
|
5 years ago |