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

# Conflicts:
#	common/common-entity/sql记录

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/consult/WxPushService.java

@@ -57,7 +57,7 @@ public class WxPushService {
         {{remark.DATA}}
         */
        String consultType = String.valueOf(consult.getType());
        String first = "key1，您好！您的咨询有新的回复";
        String first = userName+"，您好！您的咨询有新的回复";
        if(ImUtil.SESSION_TYPE_DOOR_COACH.equals(consultType)){
            first = userName +"的上门辅导服务咨询有新的回复";
        }

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/util/MessageUtil.java

@@ -191,7 +191,7 @@ public class MessageUtil {
            case 1:
                //咨询回复
                wxTemplateConfigDO.setUrl(wxTemplateConfigDO.getUrl() + "?sessionId=" + json.getString("sessionId")
                        +"&type="+json.getString("consultType"));
                        +"&type="+json.getString("consultType")+"&openid="+openid);
                break;
            case 19:
                String urlStr= wxTemplateConfigDO.getUrl();