Tree: b83ccffb6e

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from 'b83ccffb6e'

${ noResults }

Commit Graph

10299 Commits (b83ccffb6ed1541e4f0ee8b41938f049a703359d)

 

All Branches   

Search

Author	SHA1	Message	Date
zhaoqifeng	b83ccffb6e	Merge branch 'dev_third_data' into dev_temp	5 years ago
zhaoqifeng	e8cfbdfbd7	党员先锋数据展示接口	5 years ago
zhaoqifeng	74b7fa0db5	党员先锋数据展示接口	5 years ago
sunyuchao	a6c4a7663a	Merge branch 'dev_third_data' into dev_temp	5 years ago
sunyuchao	58d0511184	转议题话题不允许屏蔽或关闭	5 years ago
sunyuchao	f841ef8944	分支错误 代码回滚	5 years ago
sunyuchao	405163ae6c	已转议题话题不允许再关闭或屏蔽	5 years ago
sunyuchao	f9845dec57	Merge branch 'dev_third_data' into dev_temp # Conflicts: # epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java # epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java # epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java # epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java # epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml # 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/topic/controller/ResiTopicController.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java	5 years ago
sunyuchao	d8847b1a6d	网格层级五项基础数据查看	5 years ago
zxc	b6cb2fc5b5	群众不满	5 years ago
sunyuchao	a54d1ce689	基础数据-涉及话题数据计算的重新调整查询规则	5 years ago
sunyuchao	34cd6ed88b	Merge branch 'dev_third_data' into dev_temp	5 years ago
sunyuchao	417f410564	小组总数、热议话题统计sql脚本	5 years ago
sunyuchao	fc7b3763d0	Merge branch 'dev_third_data' into dev_temp	5 years ago
sunyuchao	fc195cdf79	热议中话题网格、机关日统计程序	5 years ago
zhaoqifeng	949abb557e	Merge branch 'dev_third_data' into dev_temp	5 years ago
zhaoqifeng	abc72c6be9	小组成员添加是否党员身份	5 years ago
zxc	d298a8ea23	Merge remote-tracking branch 'origin/dev_evaluate_add_20210510' into dev_temp	5 years ago
zxc	e4ac157a74	emm bug	5 years ago
zxc	704d040d20	Merge remote-tracking branch 'origin/dev_evaluate_add_20210510' into dev_temp	5 years ago
zxc	2c776eb409	不全项目评价统计修改	5 years ago
zxc	98b86c77fa	Merge remote-tracking branch 'origin/dev_evaluate_add_20210510' into dev_temp	5 years ago
zxc	bfae3fabdf	ID修改	5 years ago
zhaoqifeng	985765b016	党员先锋统计	5 years ago
zxc	486ba7a206	Merge branch 'dev_bug_group_member_name' into dev_temp	5 years ago
zxc	798c1b80aa	name	5 years ago
zxc	cb0e0dd354	Merge branch 'dev_bug_group_member_name' into dev_temp	5 years ago
zxc	27c525f026	组员名字修改	5 years ago
wxz	e6030cbeb5	Merge branch 'dev_third_data' into dev_temp	5 years ago
wxz	751ca4516a	Merge branch 'dev_third_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_third_data	5 years ago
wxz	77e2146f22	新增：先进排行->居民积分排行列表(不含党员) 新增：先进排行->党员积分排行	5 years ago
sunyuchao	054e20801d	部分方法代码调整	5 years ago
zxc	a009990e2f	Merge remote-tracking branch 'origin/dev_evaluate_add_20210510' into dev_temp	5 years ago
zxc	0996b8726c	啊哈哈	5 years ago
zxc	9e03b67549	Merge remote-tracking branch 'origin/dev_evaluate_add_20210510' into dev_temp	5 years ago
zxc	1d6f16178d	项目结案添加项目评价初始化数据	5 years ago
jianjun	fa5303ec97	代码暂存	5 years ago
jianjun	2176fdba6f	代码暂存	5 years ago
sunyuchao	93c015157f	合代码	5 years ago
sunyuchao	bd5b3d8379	Merge branch 'dev_third_data' into dev_temp # Conflicts: # epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSatisfactionStatisticsDao.java # epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectSatisfactionStatisticsEntity.java # epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSatisfactionStatisticsDao.xml	5 years ago
sunyuchao	598828cad6	基础数据部分查询接口及小组总数定时任务	5 years ago
yinzuomei	1b8908c281	Merge remote-tracking branch 'origin/dev_third_data' into dev_third_data	5 years ago
yinzuomei	b666def708	小组组织活动按天累计值统计	5 years ago
jianjun	5cd2ff433f	网格相关指标明细 暂存	5 years ago
sunyuchao	443a1a26a4	代码调整	5 years ago
jianjun	183977481f	代码暂存 怕丢	5 years ago
sunyuchao	4ca51fec88	组织、网格层级用户数据	5 years ago
zxc	356451982c	新增接口，查询项目评价得分	5 years ago
sunyuchao	57882c837f	Merge branch 'dev_prod_bug_syc' into dev_temp # Conflicts: # epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/OrgRankDataResultDTO.java # epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml # epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml	5 years ago
sunyuchao	d956f30461	解决生产上平音提出的下级实际超过十个组织，总数却最大只显示十个的问题【代码被修改过造成的】	5 years ago