Merge branch 'dev' into dev_frank

# Conflicts:
#	atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/FormulaContext.java

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

@@ -31,7 +31,7 @@ public class FormulaContext {
 //     如果为99，则实时计算；如果为-1，则不用于判断是否实时计算；其他情况会在对应时机计算并保存
 //     </summary>
     private Integer calculateStatus;
-//    private Map<String, FormulaResult> replaceSpecialCellFormulaDic;
-    private  FormulaAgent formulaAgent;
+    //    private Map<String, FormulaResult> replaceSpecialCellFormulaDic;
+    private FormulaAgent formulaAgent;
 
 }