Merge branch 'dev' of wangjun/wlyy2.0 into dev

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/article/ArticleEndpoint.java

@@ -403,5 +403,6 @@ public class ArticleEndpoint extends EnvelopRestEndpoint {
	public MixEnvelop getGroup(){
		MixEnvelop envelop = knowledgeCategoryService.findAllGroup();
		return envelop;
	}
}