Merge branch 'master' of https://gitee.com/youseries/ureport

ureport2-core/src/main/java/com/bstek/ureport/expression/function/math/FloorFunction.java

@@ -47,7 +47,7 @@ public class FloorFunction extends MathFunction {
 			}
 		}
 		data.setScale(pos, BigDecimal.ROUND_FLOOR);
-		return Math.ceil(data.doubleValue());
+		return Math.floor(data.doubleValue());
 	}
 
 	@Override

ureport2-core/src/main/java/com/bstek/ureport/model/Cell.java

@@ -596,7 +596,7 @@ public class Cell implements ReportCell {
 			lineHeight=cellStyle.getLineHeight();
 		}
 		fontSize=fontSize*lineHeight;
-		int singleLineHeight=UnitUtils.pointToPixel(fontSize);//fontMetrics.getHeight();
+		int singleLineHeight=UnitUtils.pointToPixel(fontSize)-2;//fontMetrics.getHeight();
 		if(textWidth<=totalColumnWidth){
 			return;
 		}