烟台政务云平台

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: 4ca51fec88

feature/evaluate

master

2021_0831_2159_before_pinginpush_mergeinto

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '4ca51fec88'

${ noResults }

epmet-cloud-zhengwu-yantai/epmet-module/gov-org

History

jianjun 032b98b94a Merge remote-tracking branch 'remotes/origin/dev_group_point' into dev # Conflicts: # epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java # epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupDTO.java # epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java # epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupEntity.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java # epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml # epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml		5 years ago
..
gov-org-client	Merge branches 'dev' and 'dev_group_act_notice' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_group_act_notice	5 years ago
gov-org-server	Merge remote-tracking branch 'remotes/origin/dev_group_point' into dev	5 years ago
pom.xml	政府组织模块移到epmet-module模块下，epmet-module的pom文件中删除原epmet-api的引用，修改epmet-gateway中bootstap.yaml中配置的路由order信息，修改gov-org-server的默认端口号为8092	6 years ago