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.

Tree: 76a5fadeed

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '76a5fadeed'

${ noResults }

epmet-cloud-lingshan/epmet-module/epmet-message

History

sunyuchao 76a5fadeed Merge branch 'dev1.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0-resiguide # Conflicts: # epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java # epmet-gateway/pom.xml # epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/DemoController.java # epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java # epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/DemoService.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java # epmet-user/epmet-user-server/pom.xml		6 years ago
..
db	初始提交	6 years ago
epmet-message-client	初始提交	6 years ago
epmet-message-server	Merge branches 'dev1.0' and 'dev1.0-authlogin' of http://121.42.41.42:7070/r/epmet-cloud into dev1.0-authlogin	6 years ago
pom.xml	政府组织模块移到epmet-module模块下，epmet-module的pom文件中删除原epmet-api的引用，修改epmet-gateway中bootstap.yaml中配置的路由order信息，修改gov-org-server的默认端口号为8092	6 years ago