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 | 
					
				
					
						
							
							
								 
								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 | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								f1be2842b8
								
							
								
							
						 | 
						
							
							
								
								trace/processList-v2 api修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								1d16f90d3e
								
							
								
							
						 | 
						
							
							
								
								议题项目分类旧程序逻辑调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								56cd038c34
								
							
								
							
						 | 
						
							
							
								
								升级auth:配置生产环境 jcet g端
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								2d72f75c8d
								
							
								
							
						 | 
						
							
							
								
								project_process修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								f970eeb74e
								
							
								
							
						 | 
						
							
							
								
								trace/projectdetail api修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								6f9bbcfaa9
								
							
								
							
						 | 
						
							
							
								
								trace/projectdetail api修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								9c1a1d89ef
								
							
								
							
						 | 
						
							
							
								
								对接三方平台修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								f3dca7d716
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_thirdplatform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_thirdplatform
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								4bea3bf5d9
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_issue_category' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_issue_category
							
							
							
							
							
							
								
							
							
							 Conflicts:
	epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java
	epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java
	epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								f1fc9d552b
								
							
								
							
						 | 
						
							
							
								
								特殊客户-居民和热心居民显示名称修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								820e8dc642
								
							
								
							
						 | 
						
							
							
								
								按天抽取暂时注释:screenProjectSettleService.extractScreenData
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								5182ba8f63
								
							
								
							
						 | 
						
							
							
								
								难点赌点生成项目话题Map时遇到同样的key覆盖上一个
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								440472f1ec
								
							
								
							
						 | 
						
							
							
								
								对接三方平台修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								41e26e774a
								
							
								
							
						 | 
						
							
							
								
								改成post请求
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								4a564833ae
								
							
								
							
						 | 
						
							
							
								
								NumConstant
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								3a3a1cab73
								
							
								
							
						 | 
						
							
							
								
								菜单缓存key,由userId 改为 customerId
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								9d0a709127
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_pyscreenv2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_pyscreenv2
							
							
							
							
							
							
								
							
							
							 Conflicts:
	epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectDataService.java
	epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectProcessService.java
	epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								10041622ea
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_pyscreen' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								bf3cd3b742
								
							
								
							
						 | 
						
							
							
								
								客户菜单-自定义
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								5d5f163648
								
							
								
							
						 | 
						
							
							
								
								命名修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								47a41ed1fc
								
							
								
							
						 | 
						
							
							
								
								controller命名修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								45df6641eb
								
							
								
							
						 | 
						
							
							
								
								screenProjectData
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								cb6c0078ac
								
							
								
							
						 | 
						
							
							
								
								初步完成对接平台的代码,平台不通,待验证
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								10c5545420
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_badge_log_20210315' into dev_badge_log_20210315
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								e6a74e72ac
								
							
								
							
						 | 
						
							
							
								
								用户注册党员连带认证居民时先插入register_relation再更新缓存
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								c677cabeba
								
							
								
							
						 | 
						
							
							
								
								徽章bug测试
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								342715a9f9
								
							
								
							
						 | 
						
							
							
								
								用户缓存信息查找注册记录传入customerId
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								093e33c22a
								
							
								
							
						 | 
						
							
							
								
								数据采集添加通用参数校验
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								8595a1d688
								
							
								
							
						 | 
						
							
							
								
								安宁数据采集接口添加验证
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								62e68b5d23
								
							
								
							
						 | 
						
							
							
								
								徽章bug测试
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								0d4a1ee11e
								
							
								
							
						 | 
						
							
							
								
								完成ApiService体系设计,准备接入具体的平台
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								68817f0770
								
							
								
							
						 | 
						
							
							
								
								徽章bug测试
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								f1ffb73dd9
								
							
								
							
						 | 
						
							
							
								
								居民端首页设置 customer_home_detail表客户Id未赋值情况
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								bec8d7e9c3
								
							
								
							
						 | 
						
							
							
								
								saveconfig和saveroleopes接口,增加customerId
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								5b9a756015
								
							
								
							
						 | 
						
							
							
								
								徽章信息插入加log日志
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								8c5ffb9209
								
							
								
							
						 | 
						
							
							
								
								徽章信息插入加log日志
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								875b87cf1d
								
							
								
							
						 | 
						
							
							
								
								徽章信息插入加log日志
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								e1a415720a
								
							
								
							
						 | 
						
							
							
								
								赋值customerId
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								fd8a83dd0a
								
							
								
							
						 | 
						
							
							
								
								customerId修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								e2c870b89d
								
							
								
							
						 | 
						
							
							
								
								customerId修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								5cb26abf59
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_pyscreenv2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_pyscreenv2
							
							
							
							
								
							
							
						 | 
						5 years ago |