wxz
							
						 | 
						
							
							
							
								
							
								037bfde241
								
							
								
							
						 | 
						
							
							
								
								给header添加,判断是否有customerId再添加到header,避免报错
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								762aaae180
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_add_customer_id' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								730a3d45f9
								
							
								
							
						 | 
						
							
							
								
								添加customerId
							
							
							
							
								
							
							
						 | 
						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
							
						 | 
						
							
							
							
								
							
								14957936f8
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_report_bug_20210125' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								547dced5b5
								
							
								
							
						 | 
						
							
							
								
								先锋模范bug修复
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								12a8b817d2
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_addcolumn_customerid' into dev_add_customer_id
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								20ce4d5548
								
							
								
							
						 | 
						
							
							
								
								群链接日志降级warn
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								979c21e5bd
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_add_customer_id' into dev_add_customer_id
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								7621e513c4
								
							
								
							
						 | 
						
							
							
								
								heart库添加客户Id字段
							
							
							
							
								
							
							
						 | 
						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
							
						 | 
						
							
							
							
								
							
								2785d868d4
								
							
								
							
						 | 
						
							
							
								
								gov-project,gov-issue库,不存在customerId的表,添加字段,对应DTO和Entity修改
							
							
							
							
								
							
							
						 | 
						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 | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								0aa52c9c1b
								
							
								
							
						 | 
						
							
							
								
								漏提代码
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								2d74bb42d0
								
							
								
							
						 | 
						
							
							
								
								point库添加客户Id字段
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								de495e319e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_zxc_bug' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								261c05104c
								
							
								
							
						 | 
						
							
							
								
								issue-process
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								a61c5f4442
								
							
								
							
						 | 
						
							
							
								
								user库添加客户Id字段
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								c8500ba129
								
							
								
							
						 | 
						
							
							
								
								gov-project库,不存在customerId的表,添加字段,对应DTO和Entity修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								4e11250575
								
							
								
							
						 | 
						
							
							
								
								gov-issue库,不存在customerId的表,添加字段,对应DTO和Entity修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								08217eae6d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix_user_redis_when_submit_partymember' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								f0aed8ef4c
								
							
								
							
						 | 
						
							
							
								
								存储用户居民信息调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								40542934fa
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_jcet' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								4883b64455
								
							
								
							
						 | 
						
							
							
								
								已转项目列表分页
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								9961a4f9a8
								
							
								
							
						 | 
						
							
							
								
								message库添加客户Id字段
							
							
							
							
								
							
							
						 | 
						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
							
						 | 
						
							
							
							
								
							
								18987a71a3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_resi_header_customerid' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								a6fa80a171
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								b7aa1b4613
								
							
								
							
						 | 
						
							
							
								
								【gateway内部认证】resi/gov同时支持customerId写入header
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								ee64fe1f5a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_add_customer_id' into dev_add_customer_id
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								fe93055760
								
							
								
							
						 | 
						
							
							
								
								oss库添加客户Id字段
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								fab3ba09a3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_jcet' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								4de7a3a272
								
							
								
							
						 | 
						
							
							
								
								【sso登录】将配置放到pom中
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								ad4a86da21
								
							
								
							
						 | 
						
							
							
								
								resi-group库,不存在customerId的表,添加字段,对应DTO和Entity修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								1ba6355acc
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_jcet' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								44e1f4e79e
								
							
								
							
						 | 
						
							
							
								
								【sso登录】根据customerid查询apiService接口,crm服务增加redis缓存
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								c719e8c6fe
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_add_customer_id' into dev_add_customer_id
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								6eef4c0d7a
								
							
								
							
						 | 
						
							
							
								
								resi_partymember库添加客户Id字段
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								6c9098526b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_jcet' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								3b2f78a0fd
								
							
								
							
						 | 
						
							
							
								
								修改sso登录,使更灵活...
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								551cc7e6d5
								
							
								
							
						 | 
						
							
							
								
								resi-group库,不存在customerId的表,添加字段,对应DTO和Entity修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								5fdf6126c3
								
							
								
							
						 | 
						
							
							
								
								陌生人导览库添加字段
							
							
							
							
								
							
							
						 | 
						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 | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								65558cd14f
								
							
								
							
						 | 
						
							
							
								
								修改sso登录,使更灵活...
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								e132e3c7b9
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_jcet' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago |