Tree: fe3b7e02f4

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from 'fe3b7e02f4'

${ noResults }

Commit Graph

12395 Commits (fe3b7e02f4e6a08a5bf92e2b0ebdd59821feacef)

 

All Branches   

Search

Author	SHA1	Message	Date
zxc	fe3b7e02f4	Merge remote-tracking branch 'origin/dev_guidance' into develop	4 years ago
zxc	bc1c0b292e	排序修改	4 years ago
sunyuchao	ba82ead4be	Merge branch 'dev_group_msg' into develop # Conflicts: # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java	4 years ago
sunyuchao	7ab738da40	漏提代码	4 years ago
sunyuchao	50985c9532	程序调整优化	4 years ago
zxc	1b9a3d6997	Merge remote-tracking branch 'origin/dev_guidance' into develop	4 years ago
zxc	ccfbbbe015	全部党员	4 years ago
zxc	cbde6493a7	全部党员	4 years ago
zhaoqifeng	f86ea8eae0	办事指南	4 years ago
sunyuchao	05f3762f41	8、活动/通知/话题评论允许有图片	4 years ago
zxc	4ae2da12e2	Merge remote-tracking branch 'origin/dev_guidance' into develop	4 years ago
zxc	da4abdd281	查询客户下党员	4 years ago
zxc	dbe78557be	Merge remote-tracking branch 'origin/dev_guidance' into develop	4 years ago
zxc	29256d2d77	群组介绍	4 years ago
zxc	55916816f7	组织生活	4 years ago
yinzuomei	55d2200dd3	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop	4 years ago
yinzuomei	1298b0acd7	去除多余的error信息	4 years ago
sunyuchao	4e4ddadd94	五种入组方式均需要推送站内信、微信消息	4 years ago
zxc	2ec305e6fe	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev	4 years ago
zxc	5ac1a9c3d6	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop	4 years ago
zxc	906dd81205	添加新字段	4 years ago
yinzuomei	9677aba586	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop	4 years ago
yinzuomei	30c306ba71	Merge remote-tracking branch 'origin/dev_staff_info' into dev	4 years ago
wxz	a8936cde2f	Merge branch 'wxz_fix_job_repeat' into develop	4 years ago
sunyuchao	879d23adfa	Merge branch 'dev_staff_info' into develop	4 years ago
wxz	3b4c455df9	修复：job重复执行	4 years ago
sunyuchao	a61fd17deb	组织下不允许看到非组织添加的人员、部门网格下添加的人不允许再部门网格下移除	4 years ago
yinzuomei	f21f8f2a5e	Merge remote-tracking branch 'origin/dev_staff_info' into dev	4 years ago
sunyuchao	a2c2f99b2a	评价指标模块 设置分值的按照【总分=各个能力值四舍五入保留一位 * 权重 相加，结果值四舍五入保留一位； 三大能力的分=原始值四舍五入保留一位* 权重，结果值四舍五入保留一位； 单项原始值：直接四舍五入保留一位小数；】调整	4 years ago
zxc	e7571f0538	四舍五入	4 years ago
yinzuomei	084be558ed	month/indexscore接口修改	4 years ago
yinzuomei	3dfb39724f	/report/fact/index/scorelist接口修改	4 years ago
yinzuomei	24c02ab557	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj	4 years ago
yinzuomei	7d2ccc1906	selectMonthPieChart修改	4 years ago
zxc	aefe316a6a	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop	4 years ago
zxc	8d08abc80c	screenProjectOrgDaily修改	4 years ago
sunyuchao	074645cbaf	Merge branch 'dev_staff_info' into develop	4 years ago
sunyuchao	23936ab743	组织内有单位领导标签的人排在前面，网格内有网格长标签的人排在前面，部门内有部门领导标签的人排在前面，相同职位及其他职位按创建顺序排序	4 years ago
sunyuchao	b27cf03db1	Merge branch 'dev_staff_info' into develop # Conflicts: # epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java # epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java # epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/ThirdOpenFeignClient.java	4 years ago
jianjun	a574ef5683	差值 差值 代码微调	4 years ago
jianjun	7e1a228191	差值 差值	4 years ago
sunyuchao	b1c45ef558	sql优化	4 years ago
jianjun	6e41c8f4a9	Merge remote-tracking branch 'remotes/origin/dev' into dev_staff_info # Conflicts: # epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java # epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java	4 years ago
jianjun	59f134ef54	。。。	4 years ago
jianjun	65d8cbcd19	倒序	4 years ago
jianjun	d657ee22cc	再次修改	4 years ago
jianjun	1549a7a1f5	Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev	4 years ago
jianjun	bdc0ab6e20	修改工作实况日期bug	4 years ago
zhaoqifeng	9491ab4989	Merge branch 'dev_bugfix_ljj' into dev	4 years ago
zhaoqifeng	7af5e7fe0e	Merge branch 'dev_bugfix_ljj' into develop	4 years ago