jianjun
							
						 | 
						
							
							
							
								
							
								467c149106
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_screen_data_an_2.0' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								c427170dfa
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_thirdplatform' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								a352ca319e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								c3ac60f481
								
							
								
							
						 | 
						
							
							
								
								生产bug修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								6b1d5b2759
								
							
								
							
						 | 
						
							
							
								
								调整report dao日志
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								24cc26deed
								
							
								
							
						 | 
						
							
							
								
								安宁 03、基层党员-党员排行榜单 采集和查询接口 添加 月份Id 字段
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d8ec9422e4
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								90cf9bf7c0
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix' into dev_difficulty_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								663a11edb0
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_difficulty_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								9e88e922b7
								
							
								
							
						 | 
						
							
							
								
								对外接口-文件上传
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								0304c5fd6c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								5a4245346f
								
							
								
							
						 | 
						
							
							
								
								部署report,statis
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								c61ce8c7d6
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_difficulty_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								800cc1ffe0
								
							
								
							
						 | 
						
							
							
								
								对外接口-查询组织基本信息
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								26b49ee5bd
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								liushaowen
							
						 | 
						
							
							
							
								
							
								9547cad3fd
								
							
								
							
						 | 
						
							
							
								
								外部调用站内信整合
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								fcf7063af2
								
							
								
							
						 | 
						
							
							
								
								sql脚本版本调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								eed9b33d76
								
							
								
							
						 | 
						
							
							
								
								sql字段错误修复
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								liushaowen
							
						 | 
						
							
							
							
								
							
								68495228a0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_wx_msg' of http://121.42.41.42:7070/r/epmet-cloud into dev_wx_msg
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								liushaowen
							
						 | 
						
							
							
							
								
							
								748a5484de
								
							
								
							
						 | 
						
							
							
								
								消息-推送微信消息
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								f1beb51f1d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								8004c9416d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_thirdplatform' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								345f6af6f1
								
							
								
							
						 | 
						
							
							
								
								消息dto补加wxOpenId字段
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								0336b72d75
								
							
								
							
						 | 
						
							
							
								
								对外接口-获取站内信模板列表
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								ba28386d11
								
							
								
							
						 | 
						
							
							
								
								wxmp_template_msg_subnscribe_status表相关对象增加open_id的属性
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								82c11e230f
								
							
								
							
						 | 
						
							
							
								
								查询模板Id sql调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								fe1977419d
								
							
								
							
						 | 
						
							
							
								
								订阅相同模板时添加关键字限制
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								bd7fec4458
								
							
								
							
						 | 
						
							
							
								
								备注
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								34d98e7354
								
							
								
							
						 | 
						
							
							
								
								治理能力-部门相关指标添加验证、分批插入
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								7cba19d507
								
							
								
							
						 | 
						
							
							
								
								修复:sql语法错误
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								da3774067a
								
							
								
							
						 | 
						
							
							
								
								修复:参数名称写错的bug
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								c02947ad52
								
							
								
							
						 | 
						
							
							
								
								保存微信订阅状态,增加事务
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								167b6fd251
								
							
								
							
						 | 
						
							
							
								
								修复:取消订阅次数不-1
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								bc4c501845
								
							
								
							
						 | 
						
							
							
								
								修复:订阅的时候,用哪个微信订阅,就给哪个openid增加次数;
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								7712ea4e7a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_wx_msg' into dev_wx_msg
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								0e967fcb48
								
							
								
							
						 | 
						
							
							
								
								修复:更新订阅信息的时候,要更新UPDATE_TIME
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								70d6796f02
								
							
								
							
						 | 
						
							
							
								
								微信消息订阅sql脚本
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								liushaowen
							
						 | 
						
							
							
							
								
							
								5b741f5439
								
							
								
							
						 | 
						
							
							
								
								bug修复
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								liushaowen
							
						 | 
						
							
							
							
								
							
								8d140a8162
								
							
								
							
						 | 
						
							
							
								
								发送订阅bug修复
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								liushaowen
							
						 | 
						
							
							
							
								
							
								83ee1078a8
								
							
								
							
						 | 
						
							
							
								
								消息删除“您好”字样
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								a23b4eec51
								
							
								
							
						 | 
						
							
							
								
								消息订阅:取消订阅+总是=清空次数,只有取消订阅,不清空次数
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								liushaowen
							
						 | 
						
							
							
							
								
							
								288006d792
								
							
								
							
						 | 
						
							
							
								
								发送微信订阅的sql中取消与订阅状态的关联
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								8fd2ad3f34
								
							
								
							
						 | 
						
							
							
								
								按月查询各项指标数据,按月份查询各项能力分数 修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								0b89850e8f
								
							
								
							
						 | 
						
							
							
								
								项目滞留提醒添加微信消息
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								8c3fb72df4
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_wx_msg' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_wx_msg
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								5f8c41b1bb
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_difficulty_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_wx_msg
							
							
							
							
							
							
								
							
							
							 Conflicts:
	epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
	epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								liushaowen
							
						 | 
						
							
							
							
								
							
								188647b416
								
							
								
							
						 | 
						
							
							
								
								accessToken获取方法变更,工作端bug修复
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								0eedb6d7e5
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_wx_msg' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_wx_msg
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								7c04bc7e8c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								a45548c5e2
								
							
								
							
						 | 
						
							
							
								
								组织树修改
							
							
							
							
								
							
							
						 | 
						5 years ago |