Merge branch 'feature/swindleInfo' into release/5.6

@@ -17,11 +17,7 @@
                 </div>
                 <div class="left swindle-info">
                     <a href="//www.yohobuy.com/help/detail?id=103" target="_blank">
-<<<<<<< HEAD
-                        <i class="iconfont">&#xe706;</i>关于防诈骗的重要提醒
-=======
-                        <i class="iconfont left">&#xe6ed;</i>关于防诈骗的重要提醒
->>>>>>> d843dacbd971592e85ffb86a67b55116ab7e73ae
+                        <i class="iconfont left">&#xe706;</i>关于防诈骗的重要提醒
                     </a>
                 </div>
                 <div class="left yoho-cert-tip"></div>