liushaowen
							
						 | 
						
							
							
							
								
							
								9876ac9b7d
								
							
								
							
						 | 
						
							
							
								
								advice修改agency_pids字段 sql
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								a23e25cb7c
								
							
								
							
						 | 
						
							
							
								
								党员认证通过后 添加党员徽章信息
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								7b27044013
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_govaccess_async' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								6957e6dc28
								
							
								
							
						 | 
						
							
							
								
								党员认证添加方法
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								8be9aa78c1
								
							
								
							
						 | 
						
							
							
								
								徽章修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								858e1b58c9
								
							
								
							
						 | 
						
							
							
								
								修改:调整权限批量添加,api和方法名称调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								04d993d90c
								
							
								
							
						 | 
						
							
							
								
								添加获取党员徽章方法
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								02f12b724b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								a2c9ccd626
								
							
								
							
						 | 
						
							
							
								
								修改user服务对外提供查询用户基本信息的接口,统一改为取user_base_info表
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								99ea55660c
								
							
								
							
						 | 
						
							
							
								
								新增:将默认权限同步到所有客户的指定角色的接口
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								17c089335f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								cdd0b6f363
								
							
								
							
						 | 
						
							
							
								
								添加获取党员徽章方法
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b7e0eff993
								
							
								
							
						 | 
						
							
							
								
								修改userResiInfoDao.selectUserResiInfoDTO,头像取user_base_info表
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								1b9e4ff5fa
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev_personal_center
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-user/epmet-user-server/pom.xml
#	epmet-user/epmet-user-server/src/main/resources/bootstrap.yml 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								5e6dd0d610
								
							
								
							
						 | 
						
							
							
								
								徽章查询修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								3dd2d2899a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								016ed7793c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								be43fe97aa
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_common' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								796cc157c7
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix' into dev_bugfix
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								6dab1ffef0
								
							
								
							
						 | 
						
							
							
								
								修改user服务/userresiinfo/getuserresiinfo接口
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								af4c0091ed
								
							
								
							
						 | 
						
							
							
								
								难点赌点 修正时间
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								7abd59833a
								
							
								
							
						 | 
						
							
							
								
								徽章认证列表获取调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								122c8cebcc
								
							
								
							
						 | 
						
							
							
								
								job feign接口日志配置
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								1d9068a573
								
							
								
							
						 | 
						
							
							
								
								我参与的议题
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								b4500939ad
								
							
								
							
						 | 
						
							
							
								
								我参与的议题
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								7f44a2d45c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix' into dev_bugfix
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								f709bedaf5
								
							
								
							
						 | 
						
							
							
								
								难点赌点 全删全增
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								bffe8dc539
								
							
								
							
						 | 
						
							
							
								
								暂时废弃 初始化多appId的方式代码
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								cac28f16de
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_gateway_whitelist' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								52b0eaea1b
								
							
								
							
						 | 
						
							
							
								
								服务统一添加 错误告警
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								97f4d46372
								
							
								
							
						 | 
						
							
							
								
								调用feign接口失败 返回错误,创建议题失败
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								252e4f76b2
								
							
								
							
						 | 
						
							
							
								
								httpclientManger 调整超时时间
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								b1ac7b1fde
								
							
								
							
						 | 
						
							
							
								
								我参与的话题,网格名称
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								203cfd864a
								
							
								
							
						 | 
						
							
							
								
								抽取到大屏-难点赌点、热心市民,小组原始数据,兼容因为删除网格而造成垃圾数据的情况
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								6d6f4b6c9d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								dd9fadda9c
								
							
								
							
						 | 
						
							
							
								
								httpclientManger 提取常量;调整超时时间为3-》4秒
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								ea4045b37e
								
							
								
							
						 | 
						
							
							
								
								修改 项目原始数据抽取 删除数据提出
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								0b4375f87c
								
							
								
							
						 | 
						
							
							
								
								修改 项目原始数据抽取 删除数据提出
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								f25e1b65b0
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								97706e0a17
								
							
								
							
						 | 
						
							
							
								
								抽取到大屏-难点赌点、热心市民,兼容因为删除网格而造成垃圾数据的情况
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								4b4a3f68d9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								b7753e0272
								
							
								
							
						 | 
						
							
							
								
								bug修改,feginclient多添加url问题
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								7193932aa0
								
							
								
							
						 | 
						
							
							
								
								添加issueID
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								8705824e0c
								
							
								
							
						 | 
						
							
							
								
								网格id去重
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								851bc4f3d7
								
							
								
							
						 | 
						
							
							
								
								日抽取添加 使用线程池异步方法
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								64954f43de
								
							
								
							
						 | 
						
							
							
								
								日抽取添加 异步方法
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								ce4d6e4f91
								
							
								
							
						 | 
						
							
							
								
								得分写入失败打印异常
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								794f8b2ee4
								
							
								
							
						 | 
						
							
							
								
								小组话题查询 徽章信息 先查缓存 缓存没有再调用user服务
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								cc54476df0
								
							
								
							
						 | 
						
							
							
								
								得分写入失败打印异常
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								1f495c3d9f
								
							
								
							
						 | 
						
							
							
								
								公众参与解决 dimGrid 维度不存在时的情况兼容
							
							
							
							
								
							
							
						 | 
						5 years ago |