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.
liushaowen
36d6286363
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
# Conflicts:
# epmet-module/data-report/data-report-server/pom.xml
# epmet-module/data-statistical/data-statistical-server/pom.xml
# epmet-module/epmet-message/epmet-message-server/pom.xml
# epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml
# epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java
# epmet-module/epmet-third/epmet-third-server/pom.xml
# epmet-module/gov-org/gov-org-server/pom.xml
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
# epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
# epmet-module/gov-project/gov-project-server/pom.xml
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
|
5 years ago |
.. |
data-report-client
|
Merge remote-tracking branch 'remotes/origin/dev_difficulty_data' into dev_wx_msg
|
5 years ago |
data-report-server
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
|
5 years ago |
pom.xml
|
1.新增data-report服务
|
5 years ago |