|  wangchao | bc9002e5a8 | 查询标签时的补偿机制里,如果客户没有一套自己的标签数据,默认初始化一套数据进去,并放入缓存。 | 5 years ago | 
				
					
						|  wangchao | 7f099d2ed1 | Merge remote-tracking branch 'origin/dev_bugfix' into dev_temp # Conflicts:
#	epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PartyBaseInfoServiceImpl.java | 5 years ago | 
				
					
						|  wangchao | 410488a767 | 修复:查询网格下注册用户时,将REGISTER = '1'改为FIRST_REGISTER = '1',过滤掉之前因跨客户产生的数据。 | 5 years ago | 
				
					
						|  wangchao | c42c78469f | Merge remote-tracking branch 'origin/dev_issue_category' into dev_temp | 5 years ago | 
				
					
						|  wangchao | 6c7d7240b7 | 标签缓存补偿修改 | 5 years ago | 
				
					
						|  yinzuomei | 830f2b6c32 | 删除部门、网格、组织,编辑网格信息sql统一修改,需更新UPDATED_TIME, | 5 years ago | 
				
					
						|  zhaoqifeng | 53d6858be3 | Merge branch 'dev_issue_category' into dev_temp | 5 years ago | 
				
					
						|  zhaoqifeng | b77916377d | 默认标签数据脚本 | 5 years ago | 
				
					
						|  yinzuomei | 0fc2502075 | report,statis,+1 | 5 years ago | 
				
					
						|  yinzuomei | 3841267263 | Merge remote-tracking branch 'origin/dev' | 5 years ago | 
				
					
						|  yinzuomei | be433248be | Merge remote-tracking branch 'origin/dev_bugfix' into dev | 5 years ago | 
				
					
						|  yinzuomei | ca3d09ef98 | 修改用户分布查询接口 | 5 years ago | 
				
					
						|  yinzuomei | 5e625c6e2d | selectDifficulty方法修改EVENT_CATEGORY_NAME为null返回'' | 5 years ago | 
				
					
						|  zxc | b6bc63bb2a | screen_cpc_base_data删除去除dateId | 5 years ago | 
				
					
						|  zxc | 710708dec7 | screen_cpc_base_data删除去除dateId | 5 years ago | 
				
					
						|  wangchao | 8537f1fe0d | Merge remote-tracking branch 'origin/dev_issue_category' into dev_temp | 5 years ago | 
				
					
						|  wangchao | e454251fcf | 项目标签保存接口修改 | 5 years ago | 
				
					
						|  sunyuchao | abc479fae4 | Merge branch 'dev_issue_category' into dev_temp | 5 years ago | 
				
					
						|  sunyuchao | f1e6f33ee3 | 分类表联合主键引起的代码调整 | 5 years ago | 
				
					
						|  zxc | dd613eed12 | 标签添加修改 | 5 years ago | 
				
					
						|  wxz | 423b48ff4f | 版本升级 | 5 years ago | 
				
					
						|  wxz | c272db367e | Merge branch 'dev' | 5 years ago | 
				
					
						|  wangchao | f508dbcae6 | Merge remote-tracking branch 'origin/dev_issue_category' into dev_temp | 5 years ago | 
				
					
						|  wangchao | 952bd1d9de | Merge remote-tracking branch 'origin/dev_issue_category' into dev_issue_category | 5 years ago | 
				
					
						|  wangchao | f9a2d24239 | 标签查询,缓存的补偿机制修改 | 5 years ago | 
				
					
						|  sunyuchao | e66d0fe737 | Merge branch 'dev_issue_category' into dev_temp | 5 years ago | 
				
					
						|  sunyuchao | 405e30dc9f | 错题代码问题 | 5 years ago | 
				
					
						|  sunyuchao | 86912ee498 | Merge branch 'dev_issue_category' into dev_temp | 5 years ago | 
				
					
						|  sunyuchao | eb4a2401b5 | bug修改 | 5 years ago | 
				
					
						|  zhaoqifeng | 392bf8a2b7 | Merge branch 'dev_issue_category' into dev_temp | 5 years ago | 
				
					
						|  zhaoqifeng | 97c0a2a8ab | 议题转项目-分类标签 | 5 years ago | 
				
					
						|  wangchao | 86332c13af | Merge remote-tracking branch 'origin/dev_issue_category' into dev_issue_category | 5 years ago | 
				
					
						|  wangchao | 92bcea2469 | 项目标签:保存 | 5 years ago | 
				
					
						|  zxc | 431ba08e3d | Merge remote-tracking branch 'origin/dev_issue_category' into dev_temp | 5 years ago | 
				
					
						|  zxc | 930859563a | 标签添加修改 | 5 years ago | 
				
					
						|  wxz | 0465bb585b | Merge branch 'dev_graceful_shutdown' into dev_temp | 5 years ago | 
				
					
						|  wxz | 19cdd873a5 | 【resi-group】调整优雅停止等待时间 | 5 years ago | 
				
					
						|  wxz | f76c396444 | Merge remote-tracking branch 'origin/dev_temp' into dev_temp | 5 years ago | 
				
					
						|  zxc | 46175483d7 | Merge remote-tracking branch 'origin/dev_issue_category' into dev_temp | 5 years ago | 
				
					
						|  zxc | 7c5782f90c | 议题网格Id修改 | 5 years ago | 
				
					
						|  wxz | fc4e17ab62 | Merge branch 'dev_graceful_shutdown' into dev_temp | 5 years ago | 
				
					
						|  wxz | b87a28e0a0 | 【resi-group】服务增加优雅停止的配置和逻辑 | 5 years ago | 
				
					
						|  sunyuchao | 31e8f87b55 | Merge branch 'dev_issue_category' into dev_temp | 5 years ago | 
				
					
						|  sunyuchao | 12cdac988c | bug修改,保存分类可以穿空的分类集合 | 5 years ago | 
				
					
						|  zxc | 1f08c1f64c | 议题标签修改/保存 tagName修改name | 5 years ago | 
				
					
						|  zhaoqifeng | 102219df98 | Merge branch 'dev_issue_category' into dev_temp | 5 years ago | 
				
					
						|  zhaoqifeng | b96444ed21 | 标签列表 | 5 years ago | 
				
					
						|  sunyuchao | e0251258d2 | Merge branch 'dev_issue_category' into dev_temp | 5 years ago | 
				
					
						|  sunyuchao | 0f61d67110 | Merge remote-tracking branch 'origin/dev_issue_category' into dev_issue_category | 5 years ago | 
				
					
						|  sunyuchao | 50e0558ca6 | 解决联合主键造成的数据重复问题 | 5 years ago |