jianjun
							
						 | 
						
							
							
							
								
							
								847d18bcb3
								
							
								
							
						 | 
						
							
							
								
								项目 议题 小组 添加数据库监控配置 分析sql
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								bcc48ba11d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_issue_category' into dev_issue_category
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0d55115691
								
							
								
							
						 | 
						
							
							
								
								项目分类字典抽取到指标库
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								2bef10724c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_ljj' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								ae9bd465ab
								
							
								
							
						 | 
						
							
							
								
								项目 议题 小组 添加数据库监控配置 分析sql
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								a6e8a50744
								
							
								
							
						 | 
						
							
							
								
								添加注释
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								a4b49c3ba9
								
							
								
							
						 | 
						
							
							
								
								方法体新增
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								0be4ad4d41
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_thirdplatform' into dev_temp
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/ThirdOpenFeignClient.java
#	epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ThirdPlatformConfigResultDTO.java
#	epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/CustomerProjectParameterController.java 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								8fb0986170
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								5d642275cb
								
							
								
							
						 | 
						
							
							
								
								修改:
							
							
							
							
							
							
								
							
							
							错误配置提交 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								ef7e198e12
								
							
								
							
						 | 
						
							
							
								
								新增:
							
							
							
							
							
							
								
							
							
							1.查询客户第三方平台配置接口 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								41e37f6a69
								
							
								
							
						 | 
						
							
							
								
								新增:
							
							
							
							
							
							
								
							
							
							1.运营端查询第三方平台项目协助配置接口 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								efe7e7405f
								
							
								
							
						 | 
						
							
							
								
								注释修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								7e75a21793
								
							
								
							
						 | 
						
							
							
								
								注释修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								070c228db3
								
							
								
							
						 | 
						
							
							
								
								注释修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								8ed45e0ed0
								
							
								
							
						 | 
						
							
							
								
								注释修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								f8bec68b4e
								
							
								
							
						 | 
						
							
							
								
								注释修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								a43dec39d7
								
							
								
							
						 | 
						
							
							
								
								注释修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								db21e72f0e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_318_wangc' into dev_bugfix_318_wangc
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								b4d30dc027
								
							
								
							
						 | 
						
							
							
								
								注释修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								84ed2e0f42
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_ljj' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								4b142408e0
								
							
								
							
						 | 
						
							
							
								
								项目发送到第三方平台
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								7f9f6615ae
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_issue_category' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								5be7fdea0e
								
							
								
							
						 | 
						
							
							
								
								议题项目分类db调整引起的代码逻辑调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								e62bbd3747
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_thirdplatform' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								92d668a34c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								c89d5a3a94
								
							
								
							
						 | 
						
							
							
								
								补充提交
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								f87d6562b2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_thirdplatform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_thirdplatform
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								7b3c63a2e2
								
							
								
							
						 | 
						
							
							
								
								增加一次性保存客户-第三方平台-action的接口
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								8b5d7cf0f9
								
							
								
							
						 | 
						
							
							
								
								添加注释
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								886c7a54a9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_issue_category' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								59ae4e2384
								
							
								
							
						 | 
						
							
							
								
								议题、项目分类、标签db调整引起的变化
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								4ef6233786
								
							
								
							
						 | 
						
							
							
								
								trace/projectDetail api修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								05d82052a0
								
							
								
							
						 | 
						
							
							
								
								trace/projectDetail api修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								f438a54e73
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev-customerfunction' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								1bf9832258
								
							
								
							
						 | 
						
							
							
								
								1、大屏项目采集分类显示上级分类用-连接,多个分类用,分割
							
							
							
							
							
							
								
							
							
							2、议题转项目V2接口发送积分事件 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								683326487f
								
							
								
							
						 | 
						
							
							
								
								修改客户菜单接口 - 入参
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								b13722872e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_thirdplatform' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								b72fa65f3c
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_thirdplatform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_thirdplatform
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								b51e5da15a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_thirdplatform' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								40afaa0c5c
								
							
								
							
						 | 
						
							
							
								
								错误提交了数据库外网地址,修正
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								98319993a1
								
							
								
							
						 | 
						
							
							
								
								【第三方平台】1.新增客户保存所选平台接口
							
							
							
							
							
							
								
							
							
							2.新增客户自定义平台名称等信息接口 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								2fd51cd7be
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_thirdplatform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_thirdplatform
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								42f8873968
								
							
								
							
						 | 
						
							
							
								
								修改第三方平台对接的设计
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								341644bc44
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix_318_wangc' into dev_temp
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java
#	epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java
#	epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
#	epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteDetailDao.xml 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								48f093e704
								
							
								
							
						 | 
						
							
							
								
								trace/processList-v2 api修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								57900ec03f
								
							
								
							
						 | 
						
							
							
								
								issueVoteStats任务修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								a66f848d95
								
							
								
							
						 | 
						
							
							
								
								trace/processList-v2 api修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								21c7ee5a0e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_thirdplatform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_thirdplatform
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								c5fd4f60ad
								
							
								
							
						 | 
						
							
							
								
								修改第三方平台对接的设计
							
							
							
							
								
							
							
						 | 
						5 years ago |