|  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 | 
				
					
						|  zxc | a910d2cfdd | 议题标签修改/保存 | 5 years ago | 
				
					
						|  sunyuchao | 8a0dc2d20c | Merge branch 'dev_issue_category' into dev_temp | 5 years ago | 
				
					
						|  sunyuchao | 927d54fbd9 | Merge remote-tracking branch 'origin/dev_issue_category' into dev_issue_category | 5 years ago | 
				
					
						|  sunyuchao | f0b1db90f7 | 获取分类接口入参去掉客户Id,改为在token中获取 | 5 years ago | 
				
					
						|  yinzuomei | 4353141e85 | 暂存3 | 5 years ago | 
				
					
						|  wxz | 790f49a43e | BaseLogAspect修改RenException的错误码判断,如果是>8000返回给用户的,就打印warn级别日志,不再报警给钉钉。如果<=8000则依旧打印error日志,报警给钉钉 | 5 years ago | 
				
					
						|  wangchao | eb21708f4b | 修改备注 | 5 years ago | 
				
					
						|  wangchao | ea574c055c | 新增方法:获取默认标签(按照类别排序)和自定义标签(按照热度排序) | 5 years ago | 
				
					
						|  yinzuomei | 1b084e639b | 暂存2 | 5 years ago | 
				
					
						|  yinzuomei | 82fa0ad9dd | 暂存1 | 5 years ago | 
				
					
						|  sunyuchao | b2cc1901e4 | Merge branch 'dev_issue_category' into dev_temp | 5 years ago | 
				
					
						|  wxz | 7e03009d97 | 版本升级 | 5 years ago | 
				
					
						|  wxz | ca6fd1cec0 | Merge branch 'dev' | 5 years ago | 
				
					
						|  wxz | 746b4166c1 | Merge branch 'dev_bugfix_accessconfig' into dev_temp | 5 years ago | 
				
					
						|  wxz | 9c1539e91b | Merge branch 'dev' into dev_temp # Conflicts:
#	epmet-gateway/pom.xml
#	epmet-module/epmet-common-service/common-service-server/pom.xml
#	epmet-module/epmet-ext/epmet-ext-server/pom.xml
#	epmet-module/epmet-heart/epmet-heart-server/pom.xml
#	epmet-module/epmet-job/epmet-job-server/pom.xml
#	epmet-module/epmet-oss/epmet-oss-server/pom.xml
#	epmet-module/gov-access/gov-access-server/pom.xml
#	epmet-module/gov-grid/gov-grid-server/pom.xml
#	epmet-module/gov-issue/gov-issue-server/pom.xml
#	epmet-module/oper-crm/oper-crm-server/pom.xml
#	epmet-module/resi-group/resi-group-server/pom.xml
#	epmet-module/resi-hall/resi-hall-server/pom.xml
#	epmet-module/resi-mine/resi-mine-server/pom.xml
#	epmet-module/resi-partymember/resi-partymember-server/pom.xml
#	epmet-user/epmet-user-server/pom.xml | 5 years ago | 
				
					
						|  wangchao | c3e5346c33 | Merge remote-tracking branch 'origin/dev_issue_category' into dev_issue_category | 5 years ago | 
				
					
						|  wangchao | 137d296242 | 查询标签列表的方法完善 | 5 years ago | 
				
					
						|  zhaoqifeng | ac3a8dd59d | 标签列表 | 5 years ago | 
				
					
						|  wxz | b1f340d8f5 | 修复:【工作端权限】运营端取消了操作,但是没取消范围,工作端小程序依然具有该权限 | 5 years ago | 
				
					
						|  zxc | 15a4f4d319 | 议题标签修改/保存 | 5 years ago | 
				
					
						|  wangchao | d89b66a1a8 | 查询标签列表的方法 IssueProjectTagDictRedis.getTagsOrderByRank(*) | 5 years ago | 
				
					
						|  zhaoqifeng | a4ff09ef58 | 分类标签初始化 | 5 years ago | 
				
					
						|  zxc | 7d334a268f | 议题标签修改/保存 | 5 years ago | 
				
					
						|  sunyuchao | 55eed24e73 | sql脚本还原 | 5 years ago | 
				
					
						|  sunyuchao | f18bb25a97 | 同步用户微信信息接口调整优化头像为非必填字段 | 5 years ago | 
				
					
						|  sunyuchao | 0aea19925e | Merge branch 'master' into dev | 5 years ago | 
				
					
						|  sunyuchao | 8546ef1aef | Merge branch 'dev_bugfix' into dev | 5 years ago | 
				
					
						|  sunyuchao | 0277866c11 | Merge branch 'dev_bugfix' into dev_temp | 5 years ago | 
				
					
						|  sunyuchao | af817561af | 同步用户微信信息接口调整优化头像为非必填字段 | 5 years ago |