wangchao
							
						 | 
						
							
							
							
								
							
								7beefc769f
								
							
								
							
						 | 
						
							
							
								
								给所有积分规则的上限描述统一描述flyway
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								230b9f2311
								
							
								
							
						 | 
						
							
							
								
								订阅消息修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								liushaowen
							
						 | 
						
							
							
							
								
							
								9953217214
								
							
								
							
						 | 
						
							
							
								
								订阅消息bug
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								188629e94d
								
							
								
							
						 | 
						
							
							
								
								给所有积分规则的上限描述统一描述、通过链接入组的入群记录不管是自动通过还是审核通过,进群描述一样
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								8483f53205
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_mess_party' into dev_temp
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
#	epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								4db6b1bf2c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_screen' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								f03c5e0304
								
							
								
							
						 | 
						
							
							
								
								先锋模范抽取2
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								99fc51c9f8
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_screen' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								d2a155906a
								
							
								
							
						 | 
						
							
							
								
								先锋模范抽取
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								119faf52d4
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_screen' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								52c4766ac4
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_screen' into dev_bugfix_screen
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0c2bc1bbd4
								
							
								
							
						 | 
						
							
							
								
								PioneerDataExtractService添加日志
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								liushaowen
							
						 | 
						
							
							
							
								
							
								66e1cf4dfd
								
							
								
							
						 | 
						
							
							
								
								话题转议题未发送订阅消息修复
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								3cae6d4936
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_voice_share_point' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								e216085dcc
								
							
								
							
						 | 
						
							
							
								
								议题分享
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								b95da501bd
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_screen' into dev_bugfix_screen
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								af99db1002
								
							
								
							
						 | 
						
							
							
								
								小组数据抽取 bug修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								11fcd347b5
								
							
								
							
						 | 
						
							
							
								
								基层党建-党员基本情况表党员总数修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								feebea78ff
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_mess_party' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								liushaowen
							
						 | 
						
							
							
							
								
							
								963ca28550
								
							
								
							
						 | 
						
							
							
								
								订阅消息bug
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								56f9a3c0fa
								
							
								
							
						 | 
						
							
							
								
								脚本调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								613bcc0322
								
							
								
							
						 | 
						
							
							
								
								行政地区编码查询
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								9acc689619
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_voice_share_point' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								79fadc6c22
								
							
								
							
						 | 
						
							
							
								
								入组申请的文案调整     flyway添加字段 issue库
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								27feebd2f9
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_screen' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ef720bffc0
								
							
								
							
						 | 
						
							
							
								
								治理能力榜单,返回parentAgencyName
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								9fadb0d831
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_thirdplatform' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								65aadd0d4d
								
							
								
							
						 | 
						
							
							
								
								订阅消息修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								7dbe156fd8
								
							
								
							
						 | 
						
							
							
								
								订阅消息修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								51079b8ae9
								
							
								
							
						 | 
						
							
							
								
								screen_party_link_masses_data md
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								1ff9451da4
								
							
								
							
						 | 
						
							
							
								
								小组抽取打印日志
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								58eb35b339
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_voice_share_point' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								e5cb9b2dca
								
							
								
							
						 | 
						
							
							
								
								大屏治理能力榜单添加上级组织名称返参
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								5566a9a137
								
							
								
							
						 | 
						
							
							
								
								话题列表,自动审核修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								81405590d5
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_voice_share_point' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								95a1ee5082
								
							
								
							
						 | 
						
							
							
								
								查询话题详情和图片时加上附件类型条件为image
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								026f230a4a
								
							
								
							
						 | 
						
							
							
								
								订阅消息修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								67b484e62a
								
							
								
							
						 | 
						
							
							
								
								【党员建群数】添加党员条件
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								153fb4e88c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_voice_share_point' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								f504dfd1d1
								
							
								
							
						 | 
						
							
							
								
								修改默认积分模板的积分上限描述
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								f29b16a2c7
								
							
								
							
						 | 
						
							
							
								
								转项目发送积分修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								b5a9b56b79
								
							
								
							
						 | 
						
							
							
								
								党员联系群众,社区级别机关显示直属网格,其他级别机关只显示下级机关不显示指数网格数据
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								153f62014f
								
							
								
							
						 | 
						
							
							
								
								修改【客户初始化】MQ逻辑,增加异常处理,增加幂等判断
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								894ef0d710
								
							
								
							
						 | 
						
							
							
								
								党建引领-先进排行榜榜单、基层治理的 公众参与排行新增上级组织名称返参,党员联系群众去掉直属网格的数据
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ef26bd924c
								
							
								
							
						 | 
						
							
							
								
								fact_origin_issue_main_daily、fact_origin_issue_log_daily表中pids修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								e3d3a16567
								
							
								
							
						 | 
						
							
							
								
								selectPartymemberAgeDistribution sql修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								2bc2167f0b
								
							
								
							
						 | 
						
							
							
								
								处理【党员建群数,群成员数】不用按照月份抽取 这里指的是总数
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								51a283bf5c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_temp' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								05cffc9aa5
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_voice_share_point' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								afcdfb5942
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bug_syc' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago |