Merge remote-tracking branch 'origin/master'

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

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