yinzuomei
							
						 | 
						
							
							
							
								
							
								afe6ecc502
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								bc4f7ca71c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								645edbdc3f
								
							
								
							
						 | 
						
							
							
								
								/gov/org/enterprise/export九小场所导出,去掉scaleTotal
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								7c18be9f14
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into pingyin_master
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								f40b2cb5fa
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_pingyiin_zqf' into dev
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								697c7b8212
								
							
								
							
						 | 
						
							
							
								
								大屏新接口
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								d1f5fdf340
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into pingyin_master
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								d78be47a9b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_pingyiin_zqf' into dev
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								bd83bbea42
								
							
								
							
						 | 
						
							
							
								
								大屏新接口
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								9211aa7f71
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into pingyin_master
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								0167b558ea
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_pingyiin_zqf' into dev
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								a588df5533
								
							
								
							
						 | 
						
							
							
								
								不校验token
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								4021b33df0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_pingyiin_zqf' into dev
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								df62818d20
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_pingyiin_zqf' into dev_pingyiin_zqf
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								cb02d7f42a
								
							
								
							
						 | 
						
							
							
								
								不校验token
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								21907fd06d
								
							
								
							
						 | 
						
							
							
								
								例行工作详情
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								df44f0aa02
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into pingyin_master
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								7b8f37ec22
								
							
								
							
						 | 
						
							
							
								
								例行工作详情
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								e058a20652
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_pingyiin_zqf' into dev
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								f4665e3cc1
								
							
								
							
						 | 
						
							
							
								
								大屏接口放在data_report服务
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								68c60affc7
								
							
								
							
						 | 
						
							
							
								
								大屏接口放在data_report服务
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								cf9e38bbe7
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into pingyin_master
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								0181c1c8cb
								
							
								
							
						 | 
						
							
							
								
								例行工作详情
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								7ffbcdec1d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into pingyin_master
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								8920ef038f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_pingyiin_zqf' into dev
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								623f4f4852
								
							
								
							
						 | 
						
							
							
								
								大屏平阴政法能力排名接口
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								8f6fc3de25
								
							
								
							
						 | 
						
							
							
								
								能力得分计算
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								413ab8204c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into pingyin_master
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								4aaf9a514e
								
							
								
							
						 | 
						
							
							
								
								导出
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								2a77f49691
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into pingyin_master
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								43dfdb56b5
								
							
								
							
						 | 
						
							
							
								
								事件上报同步
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								81b444fea7
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_pingyiin_zqf' into dev
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								9a343b4ccd
								
							
								
							
						 | 
						
							
							
								
								pom
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								d648f5054d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into pingyin_master
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								269c755b2e
								
							
								
							
						 | 
						
							
							
								
								发布者姓名查询调整
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								cebc054003
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into pingyin_master
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								47f5f30f2a
								
							
								
							
						 | 
						
							
							
								
								系统逻辑删除
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								1f42fa105d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_pingyiin_zqf' into dev
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								8f04cfba61
								
							
								
							
						 | 
						
							
							
								
								字段匹配错误
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								41a7cc3681
								
							
								
							
						 | 
						
							
							
								
								计算能力得分预留方法
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								34b000666d
								
							
								
							
						 | 
						
							
							
								
								增加字段
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								3fc1200a07
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into pingyin_master
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffWorkInfoPingyinServiceImpl.java 
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								bf985c664f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_pingyiin_zqf' into dev
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								987313b87a
								
							
								
							
						 | 
						
							
							
								
								导出行高
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								4d90a611b2
								
							
								
							
						 | 
						
							
							
								
								网格员数据同步
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								adc1995985
								
							
								
							
						 | 
						
							
							
								
								事件赋值得分相关
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								8a349a3b57
								
							
								
							
						 | 
						
							
							
								
								查询调整
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								24da078741
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_pingyiin_zqf' into dev_pingyiin_zqf
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								30ca772059
								
							
								
							
						 | 
						
							
							
								
								导出
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								5b5407d135
								
							
								
							
						 | 
						
							
							
								
								事件赋值得分相关
							
							
							
							
								
							
							
						 | 
						3 years ago |