Merge branch 'hotfix' into develop

src/main/resources/templates/activity/encourage_money/desc.html

@@ -21,7 +21,7 @@
 <div class="main-container">
     <img src="/static/templates/activity/encourage_money/desc_banner.png" class="banner-img">
     <div class="title-box">
-        <div class="welcome">欢迎使用微信支付</div>
+        <div class="welcome">欢迎使用RoyalPay支付</div>
         <div class="title">奖励再翻倍</div>
         <img class="bubble" src="/static/templates/activity/encourage_money/bubble.png">
     </div>

src/main/ui/static/templates/activity/encourage_money/desc.css

@@ -5,7 +5,7 @@ div, span, a, img {
 .main-container {
     position: relative;
     width:100%;
-    background: -webkit-linear-gradient(top, rgb(48, 175, 187), rgb(48, 175, 105));
+    background: #3fa85a;
     padding-bottom:15px;
 }
 
@@ -17,7 +17,6 @@ div, span, a, img {
 
 .title-box {
     position: relative;
-    margin-top: -70px;
 }
 
 .title-box .welcome {