jianjun
							
						 | 
						
							
							
							
								
							
								176cd44ef7
								
							
								
							
						 | 
						
							
							
								
								巡查记录生产
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								f9860426b9
								
							
								
							
						 | 
						
							
							
								
								巡查记录生产
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								6303fc2162
								
							
								
							
						 | 
						
							
							
								
								测试调整
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								b039cfae11
								
							
								
							
						 | 
						
							
							
								
								微调
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								782fff7245
								
							
								
							
						 | 
						
							
							
								
								组织、网格、人员基础信息方法模板
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								6abd984d8f
								
							
								
							
						 | 
						
							
							
								
								方法模板
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								e7c347d1f3
								
							
								
							
						 | 
						
							
							
								
								方法模板
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								932932ea48
								
							
								
							
						 | 
						
							
							
								
								新增:
							
							
							
							
							
							
								
							
							
							1.epmet-data-open模块
修改:
1.epmet-message服务,增加针对工作人员/机构的创建/更新事件适配 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								a9b81d7f66
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								31489e3425
								
							
								
							
						 | 
						
							
							
								
								customerId限制
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								7446dfb399
								
							
								
							
						 | 
						
							
							
								
								screen_project_xx表手动调用方法试试
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								30e8711868
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								32420502c5
								
							
								
							
						 | 
						
							
							
								
								fact_origin_project_category_daily抽取逻辑修改下
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								4bf11bee15
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'wxz_senseless_deploy' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								078448b60b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								d70f783f35
								
							
								
							
						 | 
						
							
							
								
								议题转项目发送消息bug修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								bf0b9dfc63
								
							
								
							
						 | 
						
							
							
								
								修改:
							
							
							
							
							
							
								
							
							
							1.CpAuthGatewayFilter的逻辑抽取为单独的类,增加针对此filter的异常拦截 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								afbc6d372a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								aa53150f6a
								
							
								
							
						 | 
						
							
							
								
								放重复提交
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								33754bf219
								
							
								
							
						 | 
						
							
							
								
								治理能力排行日统计单独接口
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								4a87c755a9
								
							
								
							
						 | 
						
							
							
								
								添加参数
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								823d61a84a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								da2cc68966
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								1925028256
								
							
								
							
						 | 
						
							
							
								
								无所谓的判断
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								5c8dd2d460
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								64114c4163
								
							
								
							
						 | 
						
							
							
								
								分母为零bug修复
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d2938f390a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								756512a24e
								
							
								
							
						 | 
						
							
							
								
								错啦
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								bedb4326d3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								3a8c954f37
								
							
								
							
						 | 
						
							
							
								
								这个不能动
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								b7294651aa
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								991e1dd873
								
							
								
							
						 | 
						
							
							
								
								用户统计报错 添加线程
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								e66a8eeaeb
								
							
								
							
						 | 
						
							
							
								
								用户统计报错 添加线程
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								01c54ce593
								
							
								
							
						 | 
						
							
							
								
								146,工作日志数据采集,url开方
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								dc88c7011a
								
							
								
							
						 | 
						
							
							
								
								用户统计报错 日志打印错误
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								03989aa9b1
								
							
								
							
						 | 
						
							
							
								
								超时配置10分钟 上线
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								e25d30cf2c
								
							
								
							
						 | 
						
							
							
								
								Revert "超时配置10分钟"
							
							
							
							
							
							
								
							
							
							This reverts commit d1820854 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d182085408
								
							
								
							
						 | 
						
							
							
								
								超时配置10分钟
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								0ddf9f91e2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'wxz_senseless_deploy' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								b580d6adac
								
							
								
							
						 | 
						
							
							
								
								Revert "暂时住掉代码 跑下任务后再回复回来"
							
							
							
							
							
							
								
							
							
							This reverts commit c7255c6e 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								c61aad2f94
								
							
								
							
						 | 
						
							
							
								
								Revert "暂时住掉代码 跑下任务后再回复回来2"
							
							
							
							
							
							
								
							
							
							This reverts commit ae986f44 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								ae986f44c7
								
							
								
							
						 | 
						
							
							
								
								暂时住掉代码 跑下任务后再回复回来2
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								c7255c6e55
								
							
								
							
						 | 
						
							
							
								
								暂时住掉代码 跑下任务后再回复回来
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								258145ce55
								
							
								
							
						 | 
						
							
							
								
								治理排行保留历史数据bug 修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								76b5437da3
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev' into dev_bugfix_ljj
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								ea7a2e0492
								
							
								
							
						 | 
						
							
							
								
								job延长等待时长 10分钟
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								b6f70d94f2
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								17d5d10961
								
							
								
							
						 | 
						
							
							
								
								用户缓存 排查下是否存在多个
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								e0c586890e
								
							
								
							
						 | 
						
							
							
								
								LoginUserHandlerMethodArgumentResolver参数解析器增加uri的日志
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								afae9c4187
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'wxz_send_message' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
							
							
							
							
								
							
							
						 | 
						4 years ago |