Merge branch 'dev/v4.10.7_tsz' of qmx/jy into feature/v4.10.7

src/web/templates/weixin/vipsubscribe/vip_introduce.html

@@ -16,11 +16,8 @@
     <link rel="stylesheet" type="text/css" href="/css/wxbutton.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" type="text/css" href="/vipsubscribe/css/vip_introduce.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" type="text/css" href="/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}"/>
-<<<<<<< HEAD
     <link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/common-module/vipsubscribe/css/vip-free-introduce-template.css?v={{Msg "seo" "version"}}">
-=======
     <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
->>>>>>> master
     <style>
         .pop-tip-group.tip-box > div,
         .pop-tip-group.active > div{