Merge branch 'developerA' into developer

src/main/resources/templates/article/detail.html

@@ -14,9 +14,12 @@
 <div class="cm-modal"></div>
 <!--导航栏-->
 <template th:replace="article/components/article-header"></template>
-<!--面包屑-->
-<div class="bar">
-    <a href="/" target="_blank">首页</a> &gt; <a  th:each="type: *{articleType}" th:if="${typeId}==${type.id}" th:text="${type.name}" href="javascript:void(0);" class="title newTitle"></a>&gt; 正文
+<div class="tip-bar">
+    <div class="tip">提示：产品详情请到采美商城搜索</div>
+    <!--面包屑-->
+    <div class="bar">
+        <a href="/" target="_blank">首页</a> &gt; <a  th:each="type: *{articleType}" th:if="${typeId}==${type.id}" th:text="${type.name}" href="javascript:void(0);" class="title newTitle"></a>&gt; 正文
+    </div>
 </div>
 <!--主体内容-->
 <div class="content clearfix" th:object="${article}">