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 | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								99427337ce
								
							
								
							
						 | 
						
							
							
								
								专题代码出示提交,sql脚本提交
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								9b1eda163a
								
							
								
							
						 | 
						
							
							
								
								部分方法停用
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								c46b6043a6
								
							
								
							
						 | 
						
							
							
								
								外部接口鉴权 加强 🈲️乱调用
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								395a2294fe
								
							
								
							
						 | 
						
							
							
								
								定时任务增加入参执行
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								b3cc5c0be8
								
							
								
							
						 | 
						
							
							
								
								gov-access开始改用FallbackFactory
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								9d27eca645
								
							
								
							
						 | 
						
							
							
								
								小组总数热议话题单独拆除定时任务,凌晨三点执行
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								9eecb70e18
								
							
								
							
						 | 
						
							
							
								
								尝试使用FeignCLientFallbackFactory方式调用datastatistical
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								3618a10648
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								5250dba0c9
								
							
								
							
						 | 
						
							
							
								
								给当前用到mq的服务 ,修改mq注册方式
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								c06fa4cff9
								
							
								
							
						 | 
						
							
							
								
								修改:抽取rocketmq主要注册逻辑到rocketmq通用模块,各服务只做最简单的调用即可
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								037b0ef1d8
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_index_explain_fix' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								c5aa48918a
								
							
								
							
						 | 
						
							
							
								
								修改:抽取rocketmq主要注册逻辑到rocketmq通用模块,各服务只做最简单的调用即可
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								b0f704ecc3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_patrol_end' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d3612f1d33
								
							
								
							
						 | 
						
							
							
								
								得分说明
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								3ef982b5d4
								
							
								
							
						 | 
						
							
							
								
								修改:项目变动rocketmq消费者,限制消费率逻辑微调
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								4f979b5c91
								
							
								
							
						 | 
						
							
							
								
								大屏工作日志组织次数、总参与人次,接口按照组织次数降序排列
							
							
							
							
								
							
							
						 | 
						4 years ago |