Tree: b77bb70af2

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from 'b77bb70af2'

${ noResults }

Commit Graph

16692 Commits (b77bb70af27d1b3546e0a9f5792b7962e4395672)

 

All Branches   

Search

Author	SHA1	Message	Date
zxc	b77bb70af2	Merge remote-tracking branch 'origin/develop' into release_temp	4 years ago
zxc	d2d0e260a0	Merge remote-tracking branch 'origin/dev_2021_12_30_bug' into develop	4 years ago
zxc	a9104ed36d	bug	4 years ago
jianjun	10f6b0e3d8	Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp	4 years ago
jianjun	52842aa6a4	Merge remote-tracking branch 'origin/develop' into develop # Conflicts: # epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java # epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java	4 years ago
jianjun	2b5c03d904	Merge branch 'dev_ic_mp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop Conflicts: epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java	4 years ago
jianjun	e8396c2f5d	网格类型字典	4 years ago
zxc	5f6bff9e6a	Merge remote-tracking branch 'origin/develop' into release_temp	4 years ago
zxc	0bbcc9fc77	Merge remote-tracking branch 'origin/dev_2021_12_30_bug' into develop	4 years ago
zxc	8feac6d00c	bug	4 years ago
sunyuchao	d78d39e368	Merge branch 'develop' into release_temp	4 years ago
sunyuchao	1ff2d6dccc	Merge remote-tracking branch 'origin/develop' into develop	4 years ago
zhaoqifeng	f6bb080d47	Merge branch 'develop' into release_temp	4 years ago
sunyuchao	1fac33c4c7	Merge branch 'dev_ic_mp' into develop	4 years ago
zhaoqifeng	f9d748da8c	Merge branch 'dev_2021_12_30_bug' into develop	4 years ago
sunyuchao	3987c54b03	网格类型字典表数据	4 years ago
zhaoqifeng	6fb98e11d0	社区党建相关bug修改	4 years ago
zhaoqifeng	fb3d6de8e8	社区党建相关bug修改	4 years ago
zxc	9ab16a31f5	Merge branch 'develop' into release_temp	4 years ago
zxc	8866a6241d	Merge branch 'dev_2021_12_30_bug' into develop	4 years ago
zxc	29047a1caa	bug	4 years ago
zxc	fce040602f	Merge branch 'develop' into release_temp	4 years ago
zxc	7f84e16da8	Merge branch 'dev_2021_12_30_bug' into develop	4 years ago
zxc	fbfb4709bf	bug	4 years ago
zxc	f3391779b5	Merge remote-tracking branch 'origin/develop' into release_temp	4 years ago
zxc	6927366be5	Merge remote-tracking branch 'origin/dev_2021_12_30_bug' into develop	4 years ago
zxc	824167180d	emm	4 years ago
wangxianzhang	037dcd1cec	Merge branch 'dev_ic_mp' into develop	4 years ago
wangxianzhang	876614fc2c	合并dev代码，并且解决冲突	4 years ago
zxc	1808423371	Merge remote-tracking branch 'origin/develop' into release_temp	4 years ago
zxc	a89e9fdbea	Merge remote-tracking branch 'origin/dev_2021_12_30_bug' into develop # Conflicts: # epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml	4 years ago
zxc	b266e8532a	项目分布分析	4 years ago
wangxianzhang	8a8c3cd218	Merge branches 'dev' and 'dev_ic_mp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ic_mp Conflicts: epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/VolunteerInfoService.java epmet-module/epmet-job/epmet-job-server/pom.xml epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java	4 years ago
yinzuomei	649a4be19c	Merge remote-tracking branch 'origin/develop' into release_temp	4 years ago
yinzuomei	70b0999a65	Merge remote-tracking branch 'origin/dev_ic_mp' into develop # Conflicts: # epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java	4 years ago
yinzuomei	70db8dec17	没毛病，就是返回null,可能是当时约定好的吧	4 years ago
zxc	e05f3eb471	Merge remote-tracking branch 'origin/develop' into release_temp	4 years ago
wangxianzhang	05b8d96bec	Merge branches 'dev' and 'wxz_dim_sync' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_dim_sync	4 years ago
zxc	5e430c8f31	Merge remote-tracking branch 'origin/dev_ic_mp' into develop	4 years ago
zxc	402c06b261	字段名添加【小程序预约列表】	4 years ago
jianjun	aaadd823e1	Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev	4 years ago
jianjun	3b0e38ad15	Merge branch 'dev_hotfix' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev	4 years ago
jianjun	6bc8ce2dbe	Merge remote-tracking branch 'origin/dev_hotfix' into dev_hotfix	4 years ago
jianjun	e99b34a4d1	存个半小时吧 让他连续点击时 别再造我的数据库了	4 years ago
wangxianzhang	55607a1118	Merge branch 'dev_hotfix' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev	4 years ago
jianjun	19c8e0ec35	Merge remote-tracking branch 'origin/dev' into dev	4 years ago
wangxianzhang	b290bd397d	Merge branch 'dev_hotfix' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_hotfix	4 years ago
wangxianzhang	fdceeece40	修改： 1.优化志愿者信息查询，异步查询	4 years ago
jianjun	927972d073	Merge branch 'dev_2021_12_30_bug' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev	4 years ago
jianjun	aaa6d179e4	查询优化 分页	4 years ago