Tree: 0c17a916cb

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '0c17a916cb'

${ noResults }

Commit Graph

11661 Commits (0c17a916cb752d15e577dbadc6e042817a8887ef)

 

All Branches   

Search

Author	SHA1	Message	Date
zxc	0c17a916cb	Merge remote-tracking branch 'origin/develop' into release_temp	4 years ago
zxc	f4a2e269a1	Merge remote-tracking branch 'origin/dev_special_subject' into develop	4 years ago
zxc	701500f3d7	aaa	4 years ago
zxc	a8de3d1260	Merge remote-tracking branch 'origin/dev_special_subject' into develop	4 years ago
zxc	d2c292e285	paixu	4 years ago
zxc	50f7c6a39a	Merge remote-tracking branch 'origin/develop' into release_temp	4 years ago
zxc	3e9fa3b90e	Merge remote-tracking branch 'origin/dev_special_subject' into develop	4 years ago
zxc	e03a02d078	限制条件	4 years ago
sunyuchao	80bfa5cea7	Merge branch 'develop' into release_temp	4 years ago
sunyuchao	f8d3ae847c	Merge branch 'dev_bug_sycsyc' into develop	4 years ago
sunyuchao	0acfd76bd6	去除无用接口入参	4 years ago
zxc	07f1e214e0	Merge remote-tracking branch 'origin/develop' into release_temp	4 years ago
zxc	5105a18f62	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop	4 years ago
yinzuomei	9d0421cfd8	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj	4 years ago
yinzuomei	53b0d9e40f	/epmet/ext/staff/permissionv2	4 years ago
zxc	941d038837	微调	4 years ago
yinzuomei	f68a403ef2	/epmet/ext/staff/permissionv2	4 years ago
zxc	db539cc0b3	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop	4 years ago
yinzuomei	17d694630d	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj	4 years ago
yinzuomei	9afde0a5b0	/workrecord/ranklist接口调整	4 years ago
zxc	e69fd4d564	修改查询客户下所有用户包括陌生人	4 years ago
yinzuomei	67e9613512	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev	4 years ago
yinzuomei	4867ae8ec7	/data/stats/plugins/workrecord/org-monthly增加pid,pids	4 years ago
sunyuchao	373c0d72ea	Merge branch 'dev_stats_fix' into dev	4 years ago
sunyuchao	533a3308a7	Merge branch 'develop' into release_temp	4 years ago
sunyuchao	3e33c1e0db	Merge branch 'dev_special_subject' into develop	4 years ago
sunyuchao	7ce2ade6c2	pids为空返回0	4 years ago
wxz	0100472aae	Merge remote-tracking branch 'origin/release_temp' into release_temp	4 years ago
wxz	d3fead5f53	Merge branch 'wxz_permission_fix' into release_temp # Conflicts: # epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java	4 years ago
sunyuchao	bbd4ac71d5	Merge branch 'develop' into release_temp	4 years ago
wxz	e9116ea004	Merge remote-tracking branch 'origin/develop' into develop	4 years ago
wxz	3b07b85e72	Merge branch 'wxz_permission_fix' into develop # Conflicts: # epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java	4 years ago
sunyuchao	ba139ad812	Merge branch 'dev_special_subject' into develop	4 years ago
wxz	686961043b	修改：如果根据currentAgencyId查不到组织信息,不再报错，直接返回空权限列表即可	4 years ago
sunyuchao	d8464502c8	pids为空返回0	4 years ago
wxz	94f64e3bcd	Merge branch 'dev_permission_fix' into release_temp	4 years ago
wxz	f6dc1060ca	Merge branch 'dev_permission_fix' into develop	4 years ago
wxz	99a1d3b057	修改：如果根据currentAgencyId查不到组织信息,不再报错，直接返回空权限列表即可	4 years ago
wxz	f657621678	Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev	4 years ago
zhaoqifeng	66d56080c3	Merge branch 'develop' into release_temp	4 years ago
zhaoqifeng	b3a5430ff4	Merge branch 'dev_special_subject' into develop	4 years ago
zhaoqifeng	a853519e4d	专题管理-入参校验	4 years ago
zxc	7f266aa4b5	Merge remote-tracking branch 'origin/dev_bug_customize' into develop	4 years ago
zxc	17ec365ee1	客户改全局	4 years ago
jianjun	285863d5d0	Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev	4 years ago
jianjun	c5ec22c1ef	添加日志	4 years ago
wxz	2570ba94a5	Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev	4 years ago
zhaoqifeng	d3cd785765	Merge branch 'develop' into release_temp	4 years ago
zhaoqifeng	387eb038d2	Merge branch 'dev_special_subject' into develop	4 years ago
zhaoqifeng	81d5db50d9	专题管理-效果预览	4 years ago