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

svr/svr-door-serivce/src/main/java/com/yihu/jw/door/util/MessageUtil.java

@@ -275,7 +275,7 @@ public class MessageUtil {
            wxTemplateConfigDO.setUrl(url + urlStr );
        }
        if (type==35){//支付提醒
            wxTemplateConfigDO.setUrl(url + wxTemplateConfigDO.getUrl()+json.getString("orderId"));
            wxTemplateConfigDO.setUrl(url + wxTemplateConfigDO.getUrl()+json.getString("orderId")+"&isMask=1");
        }
        return wxTemplateConfigDO;
    }