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.
sunyuchao
c061ca24f3
Merge remote-tracking branch 'origin/dev_grid_platform' into dev_grid_platform
# Conflicts:
# epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java
# epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DataReportingController.java
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/user/UserDao.java
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/DataReportingService.java
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/UserService.java
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java
# epmet-module/open-data-worker/open-data-worker-server/pom.xml
# epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataOrgChangeEventListener.java
# epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataStaffChangeEventListener.java
|
4 years ago |
.. |
open-data-worker-client
|
Merge remote-tracking branch 'origin/dev_grid_platform' into dev_grid_platform
|
4 years ago |
open-data-worker-server
|
Merge remote-tracking branch 'origin/dev_grid_platform' into dev_grid_platform
|
4 years ago |
pom.xml
|
新增:
|
4 years ago |