Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop

src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java

@@ -54,7 +54,7 @@ public class AliforexcelServiceImpl implements AliforexcelService {
                 row.createCell(5, Cell.CELL_TYPE_STRING).setCellValue(partner.getString("business_hours"));
                 row.createCell(6, Cell.CELL_TYPE_STRING).setCellValue(partner.getString("company_phone"));
                 row.createCell(7, Cell.CELL_TYPE_STRING).setCellValue(partner.getString(""));
-                row.createCell(8, Cell.CELL_TYPE_STRING).setCellValue(partner.getString("description"));
+                row.createCell(8, Cell.CELL_TYPE_STRING).setCellValue(partner.getString("merchant_introduction"));
                 row.createCell(9, Cell.CELL_TYPE_STRING).setCellValue(partner.getString(""));
             }
             wb.write(ous);

src/main/ui/static/templates/payment/v2/payment.css

@@ -553,4 +553,13 @@ input.value:focus {
     cursor: pointer;
     top: -40px;
     right: 0;
+}
+
+.actCharity-red{
+    color: #FB5252;
+    display: inline;
+}
+
+.actCharity{
+    display: inline;
 }