Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/overheadline/service/SettlementService.java

@@ -60,7 +60,7 @@ public class SettlementService {
                 case BashInfo.JS_CSXM:
                     money = settlement.getMoney();
                     theAmout =  settlement.getTheAmount();
-                    reason = SettementUtil.RESON_CSXM.replaceAll("xxx",String.valueOf(money)).replace("yyy",theAmout).replace("zzz","0.0").replace("ddd",String.valueOf(money));
+                    reason = SettementUtil.RESON_CSXM.replaceAll("xxx",String.valueOf(money)).replace("yyy",theAmout).replace("zzz","0.0").replace("www",String.valueOf(money));
                     settlement.setReason(reason);
                     break;
                 case BashInfo.JS_QTXM:

src/main/webapp/webpage/modules/sg/free/wbslist.jsp

@@ -421,7 +421,7 @@
                     title:data.setname,
                     // skin: 'layui-layer-rim',
                     area: ['50%', '70%'],
-                    content: "<div style='padding: 16px'>"+data.reason+"金额"+xml+"</div>"
+                    content: "<div style='padding: 16px'>"+data.reason+"</br>&nbsp;金额"+xml+"</div>"
                 });
             }
         });