wangchao
							
						 | 
						
							
							
							
								
							
								d4a954b69b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								bf6d0b584f
								
							
								
							
						 | 
						
							
							
								
								给难点赌点加上demo调用
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								6f1bef31f2
								
							
								
							
						 | 
						
							
							
								
								selectIssueProjectList方法修改,指定customer_id表名
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								bb1498614f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								0ac8f3b756
								
							
								
							
						 | 
						
							
							
								
								给mybatis返回的实体类增加无参构造器
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								c9439e3167
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								61eca4df09
								
							
								
							
						 | 
						
							
							
								
								项目详情接口修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								e138c036c6
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								3b03299ef9
								
							
								
							
						 | 
						
							
							
								
								indexstatistics
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								c5aecd42c1
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix_sync_issue_vote' into dev_temp
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								afbc9e0a9d
								
							
								
							
						 | 
						
							
							
								
								每小时将议题表决数字从缓存同步到db逻辑任务加上事务
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								a6cb06aae6
								
							
								
							
						 | 
						
							
							
								
								每小时将议题表决数字从缓存同步到db逻辑修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0d54716db3
								
							
								
							
						 | 
						
							
							
								
								indexstatistics
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								861f90cee3
								
							
								
							
						 | 
						
							
							
								
								指标计算开新方法【可多月一起计算】
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								cd14c21b4b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_mq_init_customer' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								c2d1968e17
								
							
								
							
						 | 
						
							
							
								
								修改rocketmq的注册方式:springboot注册->手动api注册
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								05ebef4d45
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' into dev_mq_init_customer
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								7df5f3f59f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								f84578f3a4
								
							
								
							
						 | 
						
							
							
								
								议题发表建议,查看建议修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								d21062f169
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_jcet' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								1082d4127f
								
							
								
							
						 | 
						
							
							
								
								h5工作端登陆调整token缓存存储位置
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								4a323725c1
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								dc7a96aca7
								
							
								
							
						 | 
						
							
							
								
								bug修改2
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								cd5402fdca
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								7f11973dc6
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_pyscreen' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								480bc7631c
								
							
								
							
						 | 
						
							
							
								
								包装类型的判断使用equals
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								934b9f600a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ad68ffe71f
								
							
								
							
						 | 
						
							
							
								
								计算分数消息通知增加monthId
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d5bfe26cdc
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_pyscreen' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								5fc7e64bb8
								
							
								
							
						 | 
						
							
							
								
								日志级别调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								a58fb5dfe3
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_pyscreen' into dev_pyscreen
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								928abb3d33
								
							
								
							
						 | 
						
							
							
								
								日志级别调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b6957cf9a0
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_pyscreen' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_pyscreen
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0d9c70578c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								46a622c83e
								
							
								
							
						 | 
						
							
							
								
								平阴大屏-下级街道or网格指数排行接口修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								2ee24b2f39
								
							
								
							
						 | 
						
							
							
								
								代码微调
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								85ce79b6f8
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								dcf6cfafa1
								
							
								
							
						 | 
						
							
							
								
								治理能力榜单接口修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								3f927a1359
								
							
								
							
						 | 
						
							
							
								
								党员联系群众查询接口sql修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								66e8f0b269
								
							
								
							
						 | 
						
							
							
								
								治理能力榜单 修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								fca8867d69
								
							
								
							
						 | 
						
							
							
								
								反参修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								147fe31528
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix_sync_issue_vote' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								38ca4218d0
								
							
								
							
						 | 
						
							
							
								
								ext查询staff信息时,agencyPath包括本级别单位
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								1164b2807a
								
							
								
							
						 | 
						
							
							
								
								非空
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								3a409fdf5d
								
							
								
							
						 | 
						
							
							
								
								修改rocketmq,客户初始化的topic和消费者组名称
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								7c4acf14e4
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								1b51d028eb
								
							
								
							
						 | 
						
							
							
								
								支部建设、联建共建下级列表接口修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								2fcc48e21d
								
							
								
							
						 | 
						
							
							
								
								支部建设、联建共建下级列表接口修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								418413d187
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								266a31158e
								
							
								
							
						 | 
						
							
							
								
								支部建设、联建共建下级列表接口修改
							
							
							
							
								
							
							
						 | 
						5 years ago |