wxz
							
						 | 
						
							
							
							
								
							
								901e62278a
								
							
								
							
						 | 
						
							
							
								
								版本升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								fb1ce0df25
								
							
								
							
						 | 
						
							
							
								
								gateway-增加epmet-openapi-adv服务
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								b0990d0ea8
								
							
								
							
						 | 
						
							
							
								
								版本升级+配置问题修复
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								d9762d1641
								
							
								
							
						 | 
						
							
							
								
								版本修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								754eaec170
								
							
								
							
						 | 
						
							
							
								
								调整adv服务的模块包含关系
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								5ada2fe3c0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								244da82c19
								
							
								
							
						 | 
						
							
							
								
								新增adv广告服务
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								157b4a9f59
								
							
								
							
						 | 
						
							
							
								
								议题已关闭列表关闭时间问题
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								5fbf9345bd
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								c13d372634
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								c9442573eb
								
							
								
							
						 | 
						
							
							
								
								解决议题已关闭列表关闭时间取错的问题
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								448682ec94
								
							
								
							
						 | 
						
							
							
								
								漏提文件
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								019e387d16
								
							
								
							
						 | 
						
							
							
								
								解决查询树结构问题
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								3642990e25
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_project_branch' into dev_project_branch
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								f99c16f3e9
								
							
								
							
						 | 
						
							
							
								
								修复异常拦截器配置错误
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								2154c6fe06
								
							
								
							
						 | 
						
							
							
								
								议题-全部
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								bb10f56796
								
							
								
							
						 | 
						
							
							
								
								小程序可下载域名中添加阿里云域名地址
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								b0357c4415
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								6e642a4283
								
							
								
							
						 | 
						
							
							
								
								小程序可下载域名中添加阿里云域名地址
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								ac3be14a2b
								
							
								
							
						 | 
						
							
							
								
								议题-全部
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								22f8a75caf
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_project_branch' into dev_project_branch
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								c7f1477911
								
							
								
							
						 | 
						
							
							
								
								查找feign掉不通的bug
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								caf7280b51
								
							
								
							
						 | 
						
							
							
								
								给难点赌点增加日志输出用来排查错误 难点赌点服务升级   80 - 81
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								6bef7b8cc0
								
							
								
							
						 | 
						
							
							
								
								给难点赌点增加日志输出用来排查错误
							
							
							
							
								
							
							
						 | 
						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 | 
					
				
					
						
							
							
								 
								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 | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								d60c4b7365
								
							
								
							
						 | 
						
							
							
								
								居民热议-表决中列表
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								01d208f7e5
								
							
								
							
						 | 
						
							
							
								
								待审核党员总数sql修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								5397dba686
								
							
								
							
						 | 
						
							
							
								
								获取组织下网格列表
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								4af252cd09
								
							
								
							
						 | 
						
							
							
								
								基层治理-红点修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								c4ce2d971d
								
							
								
							
						 | 
						
							
							
								
								议题
							
							
							
							
								
							
							
						 | 
						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 |