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.
jianjun
e24b1865ce
Merge remote-tracking branch 'remotes/origin/dev' into 市北测试
# Conflicts:
# epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml
# epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml
# epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml
# epmet-module/epmet-heart/epmet-heart-server/pom.xml
# epmet-module/gov-access/gov-access-server/pom.xml
# epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml
# epmet-module/gov-org/gov-org-server/pom.xml
# epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
# epmet-user/epmet-user-server/pom.xml
# epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
|
3 years ago |
.. |
gov-mine-client
|
系统去掉swagger
|
4 years ago |
gov-mine-server
|
Merge remote-tracking branch 'remotes/origin/dev' into 市北测试
|
3 years ago |
pom.xml
|
1.解决对client重复依赖冲突
|
5 years ago |