zxc
							
						 | 
						
							
							
							
								
							
								bd7fec4458
								
							
								
							
						 | 
						
							
							
								
								备注
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								7b1b7925c3
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								34d98e7354
								
							
								
							
						 | 
						
							
							
								
								治理能力-部门相关指标添加验证、分批插入
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								852b7f7c14
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_wx_msg' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								7cba19d507
								
							
								
							
						 | 
						
							
							
								
								修复:sql语法错误
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								bcddc6a79e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_wx_msg' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								da3774067a
								
							
								
							
						 | 
						
							
							
								
								修复:参数名称写错的bug
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								c02947ad52
								
							
								
							
						 | 
						
							
							
								
								保存微信订阅状态,增加事务
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								d3c2f9ab32
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_wx_msg' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								167b6fd251
								
							
								
							
						 | 
						
							
							
								
								修复:取消订阅次数不-1
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								dc925559e4
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_wx_msg' into dev_temp
							
							
							
							
								
							
							
						 | 
						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
							
						 | 
						
							
							
							
								
							
								7bccf56b91
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_wx_msg' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								70d6796f02
								
							
								
							
						 | 
						
							
							
								
								微信消息订阅sql脚本
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								0fce3b9289
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_wx_msg' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								liushaowen
							
						 | 
						
							
							
							
								
							
								5b741f5439
								
							
								
							
						 | 
						
							
							
								
								bug修复
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								liushaowen
							
						 | 
						
							
							
							
								
							
								8d140a8162
								
							
								
							
						 | 
						
							
							
								
								发送订阅bug修复
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								liushaowen
							
						 | 
						
							
							
							
								
							
								83ee1078a8
								
							
								
							
						 | 
						
							
							
								
								消息删除“您好”字样
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								bdca177be8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_wx_msg' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								a23b4eec51
								
							
								
							
						 | 
						
							
							
								
								消息订阅:取消订阅+总是=清空次数,只有取消订阅,不清空次数
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								e68a2d4289
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_wx_msg' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								liushaowen
							
						 | 
						
							
							
							
								
							
								288006d792
								
							
								
							
						 | 
						
							
							
								
								发送微信订阅的sql中取消与订阅状态的关联
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								4d0d0539a5
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								6e85cc9faa
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_wx_msg' into dev_temp
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java 
							
						 | 
						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
							
						 | 
						
							
							
							
								
							
								1cb333e065
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								a45548c5e2
								
							
								
							
						 | 
						
							
							
								
								组织树修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								caa5e6dab1
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								5069696731
								
							
								
							
						 | 
						
							
							
								
								组织树修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								e6f38829c2
								
							
								
							
						 | 
						
							
							
								
								组织树修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								09598814e8
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								80dd7f70e0
								
							
								
							
						 | 
						
							
							
								
								组织树修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								liushaowen
							
						 | 
						
							
							
							
								
							
								be12384c79
								
							
								
							
						 | 
						
							
							
								
								消息订阅工作端bug修复
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								601057949d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_temp' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								3b6e1d829e
								
							
								
							
						 | 
						
							
							
								
								代码还原
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								7455de0bf2
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_difficulty_data' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								a0a5607b5e
								
							
								
							
						 | 
						
							
							
								
								难点赌点sql修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								e3ec2c9ffb
								
							
								
							
						 | 
						
							
							
								
								代码还原
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								331f921b00
								
							
								
							
						 | 
						
							
							
								
								工作端数据 难点赌点展示 使用分页
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								069fe58d11
								
							
								
							
						 | 
						
							
							
								
								测试
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								f64340609f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_wx_msg' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								e89ff8ced0
								
							
								
							
						 | 
						
							
							
								
								json返参处理
							
							
							
							
								
							
							
						 | 
						5 years ago |