zxc
							
						 | 
						
							
							
							
								
							
								10fbf816f8
								
							
								
							
						 | 
						
							
							
								
								..
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								0ac0abcad3
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_data_fusion' into dev_data_fusion
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								b7691a0a71
								
							
								
							
						 | 
						
							
							
								
								嵌套异常调整,入参非空判断
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								918326a0fe
								
							
								
							
						 | 
						
							
							
								
								。。
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								f2f79f6943
								
							
								
							
						 | 
						
							
							
								
								。
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								a41a7a7314
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_data_fusion' into dev_data_fusion
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								468f6adb98
								
							
								
							
						 | 
						
							
							
								
								组织项目数据
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								2a1d19856d
								
							
								
							
						 | 
						
							
							
								
								治理指数数据采集
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								8a689a7554
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_data_fusion' into dev_data_fusion
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								3a9560f9be
								
							
								
							
						 | 
						
							
							
								
								/data/report/screen/project/projectdetailv2
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								784c5b6e10
								
							
								
							
						 | 
						
							
							
								
								基础上报部分接口模板
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								d3c081b521
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_data_fusion' into dev_data_fusion
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0106659777
								
							
								
							
						 | 
						
							
							
								
								楼梯
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								f739cceeef
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_data_fusion' into dev_data_fusion
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								55b703ad39
								
							
								
							
						 | 
						
							
							
								
								基础数据查询接口组织级调整
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								cf764b1b6f
								
							
								
							
						 | 
						
							
							
								
								/data/report/screen/project/projectdetailv2反参增加projectTitle
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								9b0c2e1805
								
							
								
							
						 | 
						
							
							
								
								/data/report/screen/agency/agencydetail-multic
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								06bfb471eb
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_data_fusion' into dev_data_fusion
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								2949eadb68
								
							
								
							
						 | 
						
							
							
								
								/data/report/screen/agency/agencydetail-multic bug
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								55fa3b074a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_data_fusion' into dev_data_fusion
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								482379082f
								
							
								
							
						 | 
						
							
							
								
								/data/report/screen/agency/agencydetail-multic
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								a166d5b389
								
							
								
							
						 | 
						
							
							
								
								群众不满和难点赌点列表增加入参areaCode,前端从/data/report/screen/agency/agencydetail这取值
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								d2b8e873fd
								
							
								
							
						 | 
						
							
							
								
								群众不满列表v2
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								770fc86699
								
							
								
							
						 | 
						
							
							
								
								群众不满列表v2
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								d6c2cf55fe
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_data_fusion' into dev_data_fusion
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								daf257506c
								
							
								
							
						 | 
						
							
							
								
								基础数据上报 部分接口
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								ebfef35c6e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_data_fusion
							
							
							
							
							
							
								
							
							
							 Conflicts:
	epmet-gateway/src/main/resources/bootstrap.yml 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								5d7054c65d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_patrol_count' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								c289d02970
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								0679a24421
								
							
								
							
						 | 
						
							
							
								
								添加日志 用户未登录异常
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b25781f844
								
							
								
							
						 | 
						
							
							
								
								/gov/mine/agency/getlatestcustomer返参增加haveSubCustomer、subCustomerIds
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								4baf1408f6
								
							
								
							
						 | 
						
							
							
								
								SATISFACTION_SCORE修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d203cfea9e
								
							
								
							
						 | 
						
							
							
								
								大屏网格员列表返回手机号(org,user,report)代码微调
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ff85e01f2e
								
							
								
							
						 | 
						
							
							
								
								难点赌点列表:difficultyrank-multic
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								ead5b4ea62
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_oper_role' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								498c9dd692
								
							
								
							
						 | 
						
							
							
								
								14个基础数据上报接口模板
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								dfa7c80111
								
							
								
							
						 | 
						
							
							
								
								大屏网格员列表返回手机号(org,user,report)
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								672662f04e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_data_fusion' into dev_data_fusion
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								8973ce412e
								
							
								
							
						 | 
						
							
							
								
								难点赌点列表:difficultyrank-multic
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								f74080fb3b
								
							
								
							
						 | 
						
							
							
								
								网格员巡查功能接口bug修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								f656bd9c43
								
							
								
							
						 | 
						
							
							
								
								gataway拦截 point请求 mqcallback 放行
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								da71725a8c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_patrol_count' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								57e78be08b
								
							
								
							
						 | 
						
							
							
								
								难点堵点-组织下拉框"mynextagency-multic"v2
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								392b75c355
								
							
								
							
						 | 
						
							
							
								
								更多-巡查记录列表可查看当前组织及下级所有网格列表下数据
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								45a9dd7c37
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_data_fusion' into dev_data_fusion
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								c2837745c3
								
							
								
							
						 | 
						
							
							
								
								难点堵点-组织下拉框"mynextagency-multic"
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								7d13637747
								
							
								
							
						 | 
						
							
							
								
								孔村,榆山,锦水pid更为平阴
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								0738a81aee
								
							
								
							
						 | 
						
							
							
								
								dto位置
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								c6656f8a3e
								
							
								
							
						 | 
						
							
							
								
								巡查中和未巡查中人数
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								06b6982b44
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'wxz_avg_samplecount' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago |