Commit Graph

2 Commits

Author SHA1 Message Date
8c479079ef Merge branch 'uat' into dev
# Conflicts:
#	src/main/java/com/chinaunicom/mall/ebtp/extend/BizServiceEbtpExtendApplication.java
#	src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/ZjcnExportServiceImpl.java
#	src/main/resources/application.yml
2021-05-25 16:05:16 +08:00
8c3114cca7 添加apollo 2021-05-25 15:52:20 +08:00