yinzuomei
							
						 | 
						
							
							
							
								
							
								492813fd98
								
							
								
							
						 | 
						
							
							
								
								公众参与采集接口调整
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								75a5f744f4
								
							
								
							
						 | 
						
							
							
								
								咋美术呢
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								5a6d64e5e1
								
							
								
							
						 | 
						
							
							
								
								/ by zero
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d8577f8501
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_public_join' into dev_public_join
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								ec98e285f3
								
							
								
							
						 | 
						
							
							
								
								公众参与 抽取bug
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								72a57622b1
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_public_join' into dev_public_join
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								12771cb0a8
								
							
								
							
						 | 
						
							
							
								
								divide
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								b34fdb9ced
								
							
								
							
						 | 
						
							
							
								
								bug
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								575c344d45
								
							
								
							
						 | 
						
							
							
								
								公众参与 查询bug
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								935d209e42
								
							
								
							
						 | 
						
							
							
								
								bug
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								babfa08a4a
								
							
								
							
						 | 
						
							
							
								
								bug修复
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								c429247428
								
							
								
							
						 | 
						
							
							
								
								数据库指定
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								67ee6c6560
								
							
								
							
						 | 
						
							
							
								
								增长率
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								f5f6ce5472
								
							
								
							
						 | 
						
							
							
								
								获取指定 月份的前n月 返回yyyyMM
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								d8268745e5
								
							
								
							
						 | 
						
							
							
								
								screen_user_join表数据抽取
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								8059011ffb
								
							
								
							
						 | 
						
							
							
								
								公众参与概括抽取 添加分子分母脚本
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								f1a4e07f4a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_public_join' into dev_public_join
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b7ebeb3da7
								
							
								
							
						 | 
						
							
							
								
								公众参与概况publicpartiprofile接口调整
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								13375eba12
								
							
								
							
						 | 
						
							
							
								
								公众参与概括抽取 添加分子分母
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0ab807c1f4
								
							
								
							
						 | 
						
							
							
								
								平阴县查看先锋模范数据sql修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								90ff95a3dc
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_0707bugfix' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_0707bugfix
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								1c3660df91
								
							
								
							
						 | 
						
							
							
								
								/data/stats/screencoll/pioneerdata先锋模范采集接口保存分母
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0f3a2f46f9
								
							
								
							
						 | 
						
							
							
								
								暂存-先锋模范抽取
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								0ed743ff04
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								0277ff6109
								
							
								
							
						 | 
						
							
							
								
								parentId 为空 因为网格可能被删除了
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								c326c79955
								
							
								
							
						 | 
						
							
							
								
								bug
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								bd3549af23
								
							
								
							
						 | 
						
							
							
								
								暂存
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								c20293f3bb
								
							
								
							
						 | 
						
							
							
								
								测试下 使用多线程
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								8aff874c88
								
							
								
							
						 | 
						
							
							
								
								测试下 使用多线程
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d043854c85
								
							
								
							
						 | 
						
							
							
								
								测试下 使用多线程
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								725e15d2ad
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_0707bugfix' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								f17479b3ef
								
							
								
							
						 | 
						
							
							
								
								大屏难点赌点列表,如果是根据areaCode查询,限制住状态为处理中:EVENT_STATUS_CODE in('pending','0'),并且是来源于网格的项目
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								15dfbea777
								
							
								
							
						 | 
						
							
							
								
								先锋模范查询修改:只有入参为370124时,写死查询8各街道的平均数,其余的全部按照agencyId查询。
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								c6958b768f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_patrol_stats' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								5d405d3ac9
								
							
								
							
						 | 
						
							
							
								
								生产bug修改 是否在巡查中状态值错误问题
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ae0901e107
								
							
								
							
						 | 
						
							
							
								
								大屏难点赌点列表,处理次数取值错误,改为:EVENT_HANDLED_COUNT
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								a66497cf46
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								e53dc0f9e0
								
							
								
							
						 | 
						
							
							
								
								基层治理--治理能力,默认按照“响应率降序排列
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								32ec19b027
								
							
								
							
						 | 
						
							
							
								
								先进支部按党员数降序排列
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								48e5075213
								
							
								
							
						 | 
						
							
							
								
								submitProjectRelationData修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								a2ca761a1b
								
							
								
							
						 | 
						
							
							
								
								将系统日志的权限枚举改为小写
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d689ef8d85
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_grid_member_statistics' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								94f3ab1fb1
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_grid_member_statistics' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								c4da1f8bb6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								9086b877eb
								
							
								
							
						 | 
						
							
							
								
								网格员统计-权限
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d4d1cc9b59
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_grid_member_statistics' into dev
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								8756e3e777
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_patrol_stats' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								75f879fefd
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								33f5bf987b
								
							
								
							
						 | 
						
							
							
								
								网格员数据统计
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								fa1279ad3e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_point_task' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago |