wangchao
							
						 | 
						
							
							
							
								
							
								caf7280b51
								
							
								
							
						 | 
						
							
							
								
								给难点赌点增加日志输出用来排查错误 难点赌点服务升级   80 - 81
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								6bef7b8cc0
								
							
								
							
						 | 
						
							
							
								
								给难点赌点增加日志输出用来排查错误
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								18767a5802
								
							
								
							
						 | 
						
							
							
								
								getstatus接口
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								828dcfc17f
								
							
								
							
						 | 
						
							
							
								
								注释维护
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								95c03e1b56
								
							
								
							
						 | 
						
							
							
								
								话题语音
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								adeb567081
								
							
								
							
						 | 
						
							
							
								
								话题语音
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								102bad7524
								
							
								
							
						 | 
						
							
							
								
								话题语音
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								e8a0bb5d95
								
							
								
							
						 | 
						
							
							
								
								注释维护
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								9bb0e8d831
								
							
								
							
						 | 
						
							
							
								
								身边党员-积分排名(已测)
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								5f14bc8fbd
								
							
								
							
						 | 
						
							
							
								
								话题语音
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								205274ffcc
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_project_branch' into dev_project_branch
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								0fc5b00ae0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_voice_share_point' into dev_project_branch
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java
#	epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/service/OssService.java
#	epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/service/impl/OssServiceImpl.java 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								a62a77c4dd
								
							
								
							
						 | 
						
							
							
								
								项目全部
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								c321e6aa45
								
							
								
							
						 | 
						
							
							
								
								议题-全部
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								e7996dd563
								
							
								
							
						 | 
						
							
							
								
								项目全部
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								a754efe0eb
								
							
								
							
						 | 
						
							
							
								
								feign接口,更换名称
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								cd3acc1ca4
								
							
								
							
						 | 
						
							
							
								
								身边党员-积分排行  接口(未测)
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								4abc1e21a7
								
							
								
							
						 | 
						
							
							
								
								保存草稿文字语音二选一
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								2efdf299b8
								
							
								
							
						 | 
						
							
							
								
								议题-全部
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								263054cb0f
								
							
								
							
						 | 
						
							
							
								
								议题-全部
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								361450dd8c
								
							
								
							
						 | 
						
							
							
								
								自测程序调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								3d10c85b2b
								
							
								
							
						 | 
						
							
							
								
								程序调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								47c25209ba
								
							
								
							
						 | 
						
							
							
								
								议题-全部
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								b2f0093f06
								
							
								
							
						 | 
						
							
							
								
								居民热议-已关闭列表
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								cbca807a6e
								
							
								
							
						 | 
						
							
							
								
								议题-全部
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								9e0e139ed0
								
							
								
							
						 | 
						
							
							
								
								议题-全部
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								28041e9285
								
							
								
							
						 | 
						
							
							
								
								红点bug修复gov-grid,gov-issue,gov-mine,resi-group,resi-partymember
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								32e85bdb15
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								4119b74548
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_red_dot' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								61b63ad2fc
								
							
								
							
						 | 
						
							
							
								
								居民热议-已转项目列表
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								9e257236d1
								
							
								
							
						 | 
						
							
							
								
								gateway新服务
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								05bb673608
								
							
								
							
						 | 
						
							
							
								
								议题-全部
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								6aabbfa629
								
							
								
							
						 | 
						
							
							
								
								发送两个事件的接口 修改入参
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								d60c4b7365
								
							
								
							
						 | 
						
							
							
								
								居民热议-表决中列表
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								01d208f7e5
								
							
								
							
						 | 
						
							
							
								
								待审核党员总数sql修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								b0edc25d37
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_voice_share_point' into dev_voice_share_point
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								a25380dc1e
								
							
								
							
						 | 
						
							
							
								
								发送积分的文案拼接    积分规则脚本修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								23a73f2d11
								
							
								
							
						 | 
						
							
							
								
								解决冲突0.9
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								3a6ccae43e
								
							
								
							
						 | 
						
							
							
								
								解决冲突
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								5397dba686
								
							
								
							
						 | 
						
							
							
								
								获取组织下网格列表
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								4af252cd09
								
							
								
							
						 | 
						
							
							
								
								基层治理-红点修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								c4ce2d971d
								
							
								
							
						 | 
						
							
							
								
								议题
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								ca590001b4
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_voice_share_point' into dev_voice_share_point
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								3b1c0a76ef
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_project_branch' into dev_project_branch
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								2ebfb4b312
								
							
								
							
						 | 
						
							
							
								
								组织加网格树
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								891a7b53db
								
							
								
							
						 | 
						
							
							
								
								话题语音
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								8c4aa888cd
								
							
								
							
						 | 
						
							
							
								
								话题语音
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								bf64fadf34
								
							
								
							
						 | 
						
							
							
								
								议题
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								ffbe343e60
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_voice_share_point' into dev_voice_share_point
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								251e1e0e43
								
							
								
							
						 | 
						
							
							
								
								生产环境  数据模块  data-stats  版本升级    79 ->  80
							
							
							
							
								
							
							
						 | 
						5 years ago |