Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql

# Conflicts:
#	atms-web/src/main/webapp/app/common/webservices/common.svc.js

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

@@ -20,7 +20,7 @@ import static pwc.taxtech.atms.common.util.FormulaUtil.resolverString;
 
 /**
  * author kevin
- * todo 需要检验公式的准确性
+ * todo 需要检验公式的准确
  */
 
 public class SUM2 extends FunctionBase implements FreeRefFunction {