Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql

atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/SUM2.java

@@ -58,7 +58,7 @@ public class SUM2 extends FunctionBase implements FreeRefFunction {
         if(map != null){
             return new NumberEval(getSUM2Data(formulaContext.getReportTemplateGroupId(), formulaContext.getPeriod(), map));
         };
-        return  null;
+        return new NumberEval(0.00);
      /*   for (int i = 0, j = valueEvals.length; i < j; i++) {
             try {
                 return new NumberEval(sum(getData(parameter(resolverString(valueEvals, operationEvaluationContext, i)))).doubleValue());