Merge branch 'master' into dev_180724_cps四期

@@ -1922,6 +1922,7 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
      * 提现
      */
     @Override
+    @Database(ForceMaster = true)
     public BigDecimal addSettlement(Integer uid) {
         settlementLog.info("addSettlement enter,uid is {}",uid);
         if (uid == null ) {

@@ -113,9 +113,22 @@
             <div class="slide-pagination clearfix">
             </div>
         </div>
-        <div class="footer">
+       <!--  <div class="footer">
             CopyRight © 2007-2017 YOHO!新力传媒
         </div>
+         -->
+        <div class="footer" style="position: relative;padding:30px 0;">
+                <hr />
+                <p style="line-height:20px;text-align: center;color: #c0c0c0;font-family: helveticaneue,'helveticaneue','microsoft yahei'; font-size: 6px">CopyRight &copy; 2007-2017 南京新与力文化传播有限公司</p>
+                <p style="line-height:20px;text-align: center;color: #c0c0c0;font-family: helveticaneue,'helveticaneue','microsoft yahei'; font-size: 6px">
+                	<a href="http://www.miibeian.gov.cn" target="_blank" rel="nofollow"><span style="line-height:40px;text-align: center;color: #c0c0c0;font-family: helveticaneue,'helveticaneue','microsoft yahei'; font-size: 6px" >苏ICP备09011225号</span></a>
+                	NewPower Co. All Right 经营许可证编号：苏B2-20120395
+                	<a href="http://www.jsdsgsxt.gov.cn/mbm/entweb/elec/certView.shtml?siteId=f2b6e3b8d18241afb8dd6cadf7f15406" target="_blank">
+                		<img style="display:inline-block" src="//cdn.yoho.cn/yohobuy-node/6.1.16/img/layout/ebsIcon.png?15fc8919c64"  />
+                    </a>
+                </p>
+        </div>
+        
         <div class="mask">
             <div class="wx-img1"></div>
             <div class="wx-img2"></div>