wangxianzhang
							
						 | 
						
							
							
							
								
							
								f2de67f574
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								cc4c666b4f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev'
							
							
							
							
								
							
							
						 | 
						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
							
						 | 
						
							
							
							
								
							
								5088ffa3f3
								
							
								
							
						 | 
						
							
							
								
								小程序预约列表
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								3c17877979
								
							
								
							
						 | 
						
							
							
								
								小程序预约列表
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								04642f7928
								
							
								
							
						 | 
						
							
							
								
								issue升级
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								d07ce541bb
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev'
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								96906ee004
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								698b859bb8
								
							
								
							
						 | 
						
							
							
								
								dbupdate
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d1fa0d177c
								
							
								
							
						 | 
						
							
							
								
								议题优化 issue job
							
							
							
							
								
							
							
						 | 
						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
							
						 | 
						
							
							
							
								
							
								dfac30dc7c
								
							
								
							
						 | 
						
							
							
								
								项目数据抽取 日志排查 up
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								667102bc7b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
							
							
							
							
								
							
							
						 | 
						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 | 
					
				
					
						
							
							
								 
								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
							
						 | 
						
							
							
							
								
							
								426b315382
								
							
								
							
						 | 
						
							
							
								
								居民热议饼图添加查询条件
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								c2de6caf76
								
							
								
							
						 | 
						
							
							
								
								小程序预约
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								9f1b46e19b
								
							
								
							
						 | 
						
							
							
								
								屏蔽市北的客户 指标计算及指标原始数据抽取
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								17920d6ab9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								3c9761abe5
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_for_shibei_customerid' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								be7521315e
								
							
								
							
						 | 
						
							
							
								
								社区党建相关bug修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								222df3ec96
								
							
								
							
						 | 
						
							
							
								
								服务措施分析导出
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								71475fc682
								
							
								
							
						 | 
						
							
							
								
								服务措施分析,分页查询
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								85289f3115
								
							
								
							
						 | 
						
							
							
								
								字段名
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								10e882d8ad
								
							
								
							
						 | 
						
							
							
								
								存他个 24小时 给我点时间 up
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								1f3d5d08f0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								7b6ef71ab1
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								4d85295a03
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								705fe60346
								
							
								
							
						 | 
						
							
							
								
								版本升级
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								e37ce4f680
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_hotfix' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								cc7bd3e2d2
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_hotfix' into dev_hotfix
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								4f52fcc85d
								
							
								
							
						 | 
						
							
							
								
								存他个 24小时 给我点时间 up
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								f16e1c9248
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								72f59aa17f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_hotfix' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								8602ee9b21
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_hotfix' into dev_hotfix
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								bcdb455099
								
							
								
							
						 | 
						
							
							
								
								fix
							
							
							
							
								
							
							
						 | 
						4 years ago |