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

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

@@ -257,7 +257,11 @@ public class FunctionBase {
                     else {return new BigDecimal(0);}
 
                 }
-            }else{
+            }else if (evalStr.indexOf("${KeyIn}")>0){
+                if (!dss.isEmpty()) return dss.get(0).getAmount();
+                return new BigDecimal(0);
+            }
+            else{
                 try {
                     BigDecimal bigDecimal = new BigDecimal(evalStr);
                     if (!dss.isEmpty()) {