wxz
							
						 | 
						
							
							
							
								
							
								6ad9023b51
								
							
								
							
						 | 
						
							
							
								
								修复:FeignCLient错误提交
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								bd6a50f687
								
							
								
							
						 | 
						
							
							
								
								tag标签对象拷贝方法调整
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								f01b5c568f
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'wxz_feign_exception_show' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_feign_exception_show
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								44a8c88d91
								
							
								
							
						 | 
						
							
							
								
								对象拷贝方法多余
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								ec3a75b263
								
							
								
							
						 | 
						
							
							
								
								修改:将所有服务的FeignClientFallBack都改为FallBackFactory
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								5f749ed8fd
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								e9ca549e1b
								
							
								
							
						 | 
						
							
							
								
								workrecord/ranklist接口修
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ff3075c201
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								8f4278ef15
								
							
								
							
						 | 
						
							
							
								
								/data/report/screen/plugins/workrecord/ranklist接口修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								587eb862a9
								
							
								
							
						 | 
						
							
							
								
								打印日志错误修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								08ea9ceb44
								
							
								
							
						 | 
						
							
							
								
								标签颜色适应调整:新加标签随机添加颜色 缓存内添加颜色
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								2ee48cf6b4
								
							
								
							
						 | 
						
							
							
								
								修复:gateway去掉webcomponentscan注解
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								a893bbc466
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'wxz_feign_exception_show' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_feign_exception_show
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								47f89e3593
								
							
								
							
						 | 
						
							
							
								
								专题管理-热门标签
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								e57ecdb874
								
							
								
							
						 | 
						
							
							
								
								专题新增3个权限key
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								323eafcca5
								
							
								
							
						 | 
						
							
							
								
								新增:GlobalFilter,tomcat容器级别,用于ThreadLocal变量残留清除
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								abec5de75d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								27718028cc
								
							
								
							
						 | 
						
							
							
								
								【专题管理】已有专题列表返参增加tagColor
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								927dadd6d2
								
							
								
							
						 | 
						
							
							
								
								标签颜色脚本
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								7fef7351b8
								
							
								
							
						 | 
						
							
							
								
								/resi/guide/stranger/publiclocationgridlist居民端去其他网格看看,限制customer_grid.SYNC_FLAG='1'
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								f3b3f19a89
								
							
								
							
						 | 
						
							
							
								
								/resi/mine/mygrid/allgrids居民端获取用户访问过的网格,限制customer_grid.SYNC_FLAG='1'
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								6019fd9122
								
							
								
							
						 | 
						
							
							
								
								修复:SQL语法漏洞
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								41a5d1837f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_special_subject' into dev_special_subject
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								bcccdc79fe
								
							
								
							
						 | 
						
							
							
								
								测试
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								fcd51e1018
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								9d89d35a6f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								460599f156
								
							
								
							
						 | 
						
							
							
								
								Revert "标签添加颜色字段;"
							
							
							
							
							
							
								
							
							
							This reverts commit f2769bb1 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								f2769bb15c
								
							
								
							
						 | 
						
							
							
								
								标签添加颜色字段;
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								f49e0c52b4
								
							
								
							
						 | 
						
							
							
								
								专题管理-热门标签
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ae054cf0ee
								
							
								
							
						 | 
						
							
							
								
								hot-subject-taglist
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0c057d0866
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								eb41373dfe
								
							
								
							
						 | 
						
							
							
								
								议题发表建议限制必填
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								00223ce39c
								
							
								
							
						 | 
						
							
							
								
								专题管理-热门标签
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								ed65e9d402
								
							
								
							
						 | 
						
							
							
								
								专题管理-热门标签
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								fdff195cdb
								
							
								
							
						 | 
						
							
							
								
								专题-组织网格数
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								4e30e5544d
								
							
								
							
						 | 
						
							
							
								
								专题文章列表,专题列表
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								3026be62aa
								
							
								
							
						 | 
						
							
							
								
								专题文章列表,专题列表
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								e0e060fa60
								
							
								
							
						 | 
						
							
							
								
								注释
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								98ce45250b
								
							
								
							
						 | 
						
							
							
								
								commit4
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								079267b71f
								
							
								
							
						 | 
						
							
							
								
								commit3
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								44944da978
								
							
								
							
						 | 
						
							
							
								
								党建园地-已结案项目议题列表sql调整
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ea90b26e2b
								
							
								
							
						 | 
						
							
							
								
								commit3
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b619ec965c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_special_subject' into dev_special_subject
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
#	epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								807c4bf1d3
								
							
								
							
						 | 
						
							
							
								
								commit2
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								61a87b08f7
								
							
								
							
						 | 
						
							
							
								
								根据gridId查询pids
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								157007fa5c
								
							
								
							
						 | 
						
							
							
								
								commit
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								f6b2934e3f
								
							
								
							
						 | 
						
							
							
								
								居民端党建园地 获取结案项目对应议题列表bug修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								a8ba6778a3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'wxz_rocketmq_reg' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								6cce31ad4a
								
							
								
							
						 | 
						
							
							
								
								外部接口鉴权 401打印日志
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								cda3b50e22
								
							
								
							
						 | 
						
							
							
								
								外部接口鉴权 401打印日志
							
							
							
							
								
							
							
						 | 
						4 years ago |