Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/XzzxEntranceService.java
#	svr/svr-internet-hospital-entrance/src/main/java/com/yihu/jw/entrance/controller/XzzxCotroller.java

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/wechat/WeiXinEventProcess.java

@@ -93,8 +93,8 @@ public class WeiXinEventProcess {
            article.put("Url", url);
            article.put("Title", keys[1] + "医生个人诊间");
            article.put("Description", "请点击查看医生详情并申请签约");
            article.put("PicUrl", "");
            article.put("Description", "厦门眼科中心医院互联网医院");
            article.put("PicUrl", url);
            articles.add(article);
            // 消息XML