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

jpress-web-template-usoftchina/src/main/webapp/templates/usoftchina/footer.html

@@ -111,11 +111,11 @@
 		$('body').animate({ scrollTop: 0 }, 1000);
 		return false;
 	})
-    <!--var _hmt = _hmt || [];-->
-    <!--(function() {-->
-        <!--var hm = document.createElement("script");-->
-        <!--hm.src = "https://hm.baidu.com/hm.js?592448f203e07723f276b61fdca58573";-->
-        <!--var s = document.getElementsByTagName("script")[0];-->
-        <!--s.parentNode.insertBefore(hm, s);-->
-    <!--})();-->
+    var _hmt = _hmt || [];
+    (function() {
+        var hm = document.createElement("script");
+        hm.src = "https://hm.baidu.com/hm.js?592448f203e07723f276b61fdca58573";
+        var s = document.getElementsByTagName("script")[0];
+        s.parentNode.insertBefore(hm, s);
+    })();
 </#macro>

jpress-web-template-usoftchina/src/main/webapp/templates/usoftchina/page_solutions.html

@@ -461,7 +461,7 @@
 							<li class="img7"><a href="soMicro"><span></span><h4>电子商贸</h4><p>规避风险，提高效率</p></a></li>
 							<li class="img8"><a href="soMicro"><span></span><h4>五金机械</h4><p>规避风险，提高效率</p></a></li>
 							<li class="img9"><a href="soMicro"><span></span><h4>MES系统</h4><p>真正实现企业效益最大化</p></a></li>
-							<li class="img10"><a href="soMicro"><span></span><h4>B2B供应链</h4><p>规范流程业务</p></a></li>
+							<!--<li class="img10"><a href="soMicro"><span></span><h4>B2B供应链</h4><p>规范流程业务</p></a></li>-->
 						</ul>
 					</div>
 					<div class="solution-icon-list">