yinzuomei
							
						 | 
						
							
							
							
								
							
								0088c45ab7
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_jcet' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								5131ec0cfa
								
							
								
							
						 | 
						
							
							
								
								tokenDto增加customerId
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								ce68c5d97f
								
							
								
							
						 | 
						
							
							
								
								修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								1f13fd5f51
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_jcet' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								0ca8c61909
								
							
								
							
						 | 
						
							
							
								
								screenProjectQuantityOrgMonth
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								182bfe798d
								
							
								
							
						 | 
						
							
							
								
								sso陌生人导览网格列表 增加customerId校验 从token中获取客户Id
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								1e4b584018
								
							
								
							
						 | 
						
							
							
								
								customer_relation增加area_code、LEVEL
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								a4a8034c54
								
							
								
							
						 | 
						
							
							
								
								sso陌生人导览网格列表 增加customerId校验 从token中获取客户Id
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								60f45dc3d9
								
							
								
							
						 | 
						
							
							
								
								customer_relation放到oper_crm库
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								cca5e752ab
								
							
								
							
						 | 
						
							
							
								
								screenProjectOrgDaily
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								e0e674c5c8
								
							
								
							
						 | 
						
							
							
								
								事件分析:数量统计、月度数量分析、效率分析查询api
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								3d4ad49b29
								
							
								
							
						 | 
						
							
							
								
								screenProjectGridDaily
							
							
							
							
							
							
								
							
							
							screenProjectQuantityGrid 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								1a3de66875
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'newbranch' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								7460339381
								
							
								
							
						 | 
						
							
							
								
								积分排行榜分页查询修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								83a7b6b5d1
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_jcet' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								27b44593a2
								
							
								
							
						 | 
						
							
							
								
								增加请求酒城e通后台的日志
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								e6c87975c1
								
							
								
							
						 | 
						
							
							
								
								发送mq消息 如果失败重试1次
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								5fee231303
								
							
								
							
						 | 
						
							
							
								
								修改发送消息网关消息日志级别
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								81a7863b5b
								
							
								
							
						 | 
						
							
							
								
								事件上传修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								50b5ca3e0c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_init_syc' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								8ac0c4cea7
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_jcet' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								c548d2e4ca
								
							
								
							
						 | 
						
							
							
								
								新增生产环境的jcet配置
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								4add2977af
								
							
								
							
						 | 
						
							
							
								
								事件、项目移动文件夹
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								7d59b04fbc
								
							
								
							
						 | 
						
							
							
								
								canshujiaoyan
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								07b1ec7027
								
							
								
							
						 | 
						
							
							
								
								事件、项目数据采集controller
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ed86f3f24d
								
							
								
							
						 | 
						
							
							
								
								机器人报警群日志降级、空指针修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								df16c6d386
								
							
								
							
						 | 
						
							
							
								
								事件、项目数据采集service,删除多余传参dto
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								20f775940a
								
							
								
							
						 | 
						
							
							
								
								事件、项目数据采集相关文件
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								16baf6007a
								
							
								
							
						 | 
						
							
							
								
								146脚本修改V1
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								fd5d30668a
								
							
								
							
						 | 
						
							
							
								
								事件分析表脚本修改V2
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0fd57e8d52
								
							
								
							
						 | 
						
							
							
								
								事件分析表脚本修改V1
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								2491425ac6
								
							
								
							
						 | 
						
							
							
								
								事件分析表脚本修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								be0c17d670
								
							
								
							
						 | 
						
							
							
								
								撤回修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								b5037d315b
								
							
								
							
						 | 
						
							
							
								
								epmet_evaluation_index库,不存在customerId的表,添加字段,对应DTO和Entity修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								116ae9c353
								
							
								
							
						 | 
						
							
							
								
								客户初始化新增积分规则和指标计算初始化方法
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								547dced5b5
								
							
								
							
						 | 
						
							
							
								
								先锋模范bug修复
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								20ce4d5548
								
							
								
							
						 | 
						
							
							
								
								群链接日志降级warn
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								38d96b725f
								
							
								
							
						 | 
						
							
							
								
								146大屏查询接口
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								5784c39b99
								
							
								
							
						 | 
						
							
							
								
								146数据采集
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								1485983686
								
							
								
							
						 | 
						
							
							
								
								epmet_evaluation_index、epmet_data_statistical_display库新增146体系相关表
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								f33bbc03ba
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_zxc_bug' into dev_jcet
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-commons/pom.xml
#	epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
#	epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
#	epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								261c05104c
								
							
								
							
						 | 
						
							
							
								
								issue-process
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								4883b64455
								
							
								
							
						 | 
						
							
							
								
								已转项目列表分页
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								00cf9003c1
								
							
								
							
						 | 
						
							
							
								
								1、指标计算:IndexCalculateService.indexCalculate方法修改;2、所有指数查询接口添加@RequestHeader中的customerId
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								c12821a47b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_resi_header_customerid' into dev_areaCode
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								b7aa1b4613
								
							
								
							
						 | 
						
							
							
								
								【gateway内部认证】resi/gov同时支持customerId写入header
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								4de7a3a272
								
							
								
							
						 | 
						
							
							
								
								【sso登录】将配置放到pom中
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								44e1f4e79e
								
							
								
							
						 | 
						
							
							
								
								【sso登录】根据customerid查询apiService接口,crm服务增加redis缓存
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								3b2f78a0fd
								
							
								
							
						 | 
						
							
							
								
								修改sso登录,使更灵活...
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								ee2afc5f86
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_jcet' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_jcet
							
							
							
							
								
							
							
						 | 
						5 years ago |