Tree: 3002885cea

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '3002885cea'

${ noResults }

Commit Graph

16770 Commits (3002885cea37835f9072ba0f8dc4aa410a5ea89c)

 

All Branches   

Search

Author	SHA1	Message	Date
jianjun	2223cef9b9	Merge remote-tracking branch 'remotes/origin/dev_2021_12_30_bug' into dev # Conflicts: # epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml	4 years ago
wangxianzhang	037dcd1cec	Merge branch 'dev_ic_mp' into develop	4 years ago
wangxianzhang	876614fc2c	合并dev代码，并且解决冲突	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	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
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
zhaoqifeng	7a88c5ac39	项目抽取效率改进	4 years ago
zxc	269beabd2a	Merge remote-tracking branch 'origin/dev_ic_mp' into develop	4 years ago
zxc	5088ffa3f3	小程序预约列表	4 years ago
zxc	8dd52ad595	Merge remote-tracking branch 'origin/dev_ic_mp' into develop	4 years ago
zxc	3c17877979	小程序预约列表	4 years ago
zxc	96906ee004	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev	4 years ago
zxc	698b859bb8	dbupdate	4 years ago
zxc	b626d3e2d6	Merge remote-tracking branch 'origin/dev_ic_mp' into develop	4 years ago
zxc	f1333e72c7	居民预约	4 years ago
jianjun	79667773b4	Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev	4 years ago
jianjun	c8ddb745ee	Merge branch 'dev_hotfix' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev	4 years ago
jianjun	9c99e653ff	项目数据抽取 日志排查	4 years ago
jianjun	22ee65170f	Merge branch 'dev_hotfix' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev	4 years ago
jianjun	bc45b7a5f3	项目数据抽取 日志排查	4 years ago
yinzuomei	f1ef68f92b	Merge remote-tracking branch 'origin/develop' into develop	4 years ago
yinzuomei	75f9c6b4f1	Merge remote-tracking branch 'origin/dev_ic_mp' into develop # Conflicts: # epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java	4 years ago
zxc	9d795947c8	Merge remote-tracking branch 'origin/dev_ic_mp' into develop # Conflicts: # epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java	4 years ago
zxc	e6da73bb66	居民预约	4 years ago
yinzuomei	33946fcd46	Merge branches 'dev' and 'dev_ic_mp' of http://121.42.41.42:7070/r/epmet-cloud into dev_ic_mp Conflicts: epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java	4 years ago
jianjun	018e4e22c5	Merge remote-tracking branch 'origin/dev_hotfix' into dev_hotfix	4 years ago
jianjun	30bc8f327c	添加执行记录结果	4 years ago
yinzuomei	cb087f3d43	服务措施分析导出	4 years ago
zxc	a9f45dd6d9	Merge remote-tracking branch 'origin/dev_2021_12_30_bug' into develop	4 years ago
zxc	426b315382	居民热议饼图添加查询条件	4 years ago
zxc	bdb7e50fa1	Merge remote-tracking branch 'origin/dev_ic_mp' into develop	4 years ago
zxc	c2de6caf76	小程序预约	4 years ago
jianjun	3c9761abe5	Merge remote-tracking branch 'remotes/origin/dev_for_shibei_customerid' into dev	4 years ago
zhaoqifeng	8c25b05f00	Merge branch 'dev_2021_12_30_bug' into develop	4 years ago
yinzuomei	b27344e6b7	Merge remote-tracking branch 'origin/dev_ic_mp' into develop	4 years ago