Merge remote-tracking branch 'origin/developerB' into developerB

src/main/resources/templates/supplier-center/encyclopedia/edit.html

@@ -327,7 +327,7 @@
                 </div>
                 <div class="bk-control">
                     <button @click="showAgreement=false">我已阅读并知晓</button>
-                    <div class="bk-link"><a href="#">《采美百科用户服务协议》</a></div>
+                    <div class="bk-link"><a href="/help/1042.html">《采美百科用户服务协议》</a></div>
                 </div>
             </div>
         </div>