Tree: 2aca93fc1d

dev

dev_shibei_match

feature/teamB_zz_wgh

master

release

2021_0831_2159_before_pinginpush_mergeinto

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '2aca93fc1d'

${ noResults }

Commit Graph

6701 Commits (2aca93fc1d0df1be2bf42cec4416dd25db9ffe14)

 

All Branches   

Search

Author	SHA1	Message	Date
jianjun	e0177da038	Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_temp	5 years ago
zxc	ca48ac6fa5	项目详情修改	5 years ago
jianjun	23b7685102	Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_temp	5 years ago
zxc	1d81408cf4	党支部分布，用户分布，党员分布 调整显示智慧社区要显示的	5 years ago
jianjun	9f3ee08553	添加注释	5 years ago
zhaoqifeng	45071ddf18	项目超期滞留提醒定时任务	5 years ago
jianjun	dccc9a8b1b	Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_temp	5 years ago
jianjun	1949da956b	五级指标原始值 添加权重	5 years ago
sunyuchao	64463005c0	项目结案也要给转项目人发消息	5 years ago
jianjun	436f798caf	Merge remote-tracking branch 'remotes/origin/dev_difficulty_data' into dev_temp	5 years ago
jianjun	79cdd1a2b8	Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_difficulty_data # Conflicts: # epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java	5 years ago
jianjun	974622bfdd	Merge remote-tracking branch 'remotes/origin/dev_difficulty_data' into dev_temp	5 years ago
jianjun	14ed396fc9	删除错误包	5 years ago
zhaoqifeng	40bc5d0320	项目超期滞留提醒定时任务	5 years ago
jianjun	04bddf2285	Merge remote-tracking branch 'remotes/origin/dev_difficulty_data' into dev_temp # Conflicts: # epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/project/ProjectController.java # epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/ProjectService.java # epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java # epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java # epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/fallback/EpmetCommonServiceOpenFeignClientFallback.java # epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java	5 years ago
zxc	23d4e4a8ca	项目详情	5 years ago
jianjun	f4e4299520	删除错误包	5 years ago
jianjun	bc9a7faa60	Merge remote-tracking branch 'origin/dev_difficulty_data' into dev_difficulty_data	5 years ago
wangchao	84bcaf98f7	Merge remote-tracking branch 'origin/dev_difficulty_data' into dev_temp # Conflicts: # epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java	5 years ago
wangchao	62093f1bc7	feign注解	5 years ago
jianjun	c13fcd5484	Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_difficulty_data # Conflicts: # epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/project/ProjectController.java # epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/ProjectService.java # epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java # epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java # epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/fallback/EpmetCommonServiceOpenFeignClientFallback.java # epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectProcessService.java # epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java	5 years ago
wangchao	b74d86536c	Merge remote-tracking branch 'origin/dev_difficulty_data' into dev_temp # Conflicts: # epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/project/ProjectController.java # epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/ProjectService.java # epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java # epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java # epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/fallback/EpmetCommonServiceOpenFeignClientFallback.java # epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectProcessService.java # epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java	5 years ago
wxz	f060b2656a	发送微信订阅消息接口，增加try-catch和计时	5 years ago
jianjun	4bcfff380f	Merge remote-tracking branch 'remotes/origin/master_bugfix' into dev_difficulty_data # Conflicts: # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java # epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml	5 years ago
wxz	3c0f0ac22f	Merge remote-tracking branch 'origin/dev_wx_msg' into dev_wx_msg	5 years ago
wxz	a2680974d8	增加线程池配置 将发送消息逻辑改造成异步的	5 years ago
sunyuchao	40ef8fd6b4	漏提代码	5 years ago
liushaowen	43af53a9fc	Merge branch 'dev_wx_msg' of http://121.42.41.42:7070/r/epmet-cloud into dev_wx_msg	5 years ago
liushaowen	07d737d154	revert	5 years ago
jianjun	69f3a55a0c	Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_temp	5 years ago
sunyuchao	f4684a499f	议题关闭、议题转项目、项目退回、项目结案添加发送微信订阅消息	5 years ago
wangchao	921c52a10b	因为项目业务改造而需要将历史数据补充到新表的逻辑，从data-stats移动到gov-project下	5 years ago
zxc	759c3ce4b5	Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp	5 years ago
zxc	ed2739ae60	项目详情	5 years ago
zxc	3007f286f1	项目详情	5 years ago
liushaowen	0aef57ccab	发送订阅：1.热心居民申请 3.建组申请 5.入组申请 7.邀请进组审核 8.组员禁言 9.党员认证申请	5 years ago
sunyuchao	7a0b6ba3cb	发布文章审核、取消活动添加发送微信订阅消息	5 years ago
wxz	56dfcf89e7	Merge branch 'dev_newversion' into dev_temp # Conflicts: # epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml # epmet-auth/deploy/docker-compose-dev.yml # epmet-gateway/deploy/docker-compose-dev.yml # epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml # epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml # epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-dev.yml # epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml # epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml # epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml # epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml # epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml # epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml # epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml # epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml # epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml # epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml # epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml # epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml # epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml # epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml # epmet-module/oper-access/oper-access-server/deploy/docker-compose-dev.yml # epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml # epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml # epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml # epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml # epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml # epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml # epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml # epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml # epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-dev.yml # epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml # epmet-user/epmet-user-server/deploy/docker-compose-dev.yml	5 years ago
wxz	752b5fa889	开发启用新的版本号	5 years ago
wxz	4b2f888834	Merge branch 'dev_newversion' into dev_temp # Conflicts: # epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml	5 years ago
wxz	a73eeee6a2	oss测试启用新的版本号	5 years ago
jianjun	19ae3760b7	部署report	5 years ago
jianjun	c3e3e19a94	Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_temp	5 years ago
jianjun	b943131d11	本级及下级 乘以权重	5 years ago
zxc	c09701e7fd	Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp	5 years ago
zxc	a5915b1196	项目详情	5 years ago
zxc	cf983f6696	report,project服务升级	5 years ago
zxc	d95f0ad25c	Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp	5 years ago
zxc	328a76a173	项目详情	5 years ago
jianjun	8e56e56210	部署report	5 years ago