Merge branch 'dev_neo' into 'dev'

[DEV] change formula data dto to data dto bugs

See merge request root/atms!65

atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/FormulaAgent.java

@@ -82,7 +82,7 @@ public class FormulaAgent extends VatAbstractService {
             ds.setDescription(m.getDescription());
             ds.setKeyValueDataId(m.getKeyValueDataID());
             ds.setName(m.getName());
-            ds.setId(Long.parseLong(m.getId()));
+            ds.setId(m.getId());
             ds.setType(m.getType());
             ds.setUpdateBy(m.getUpdater());
             ds.setUpdateTime(m.getUpdateTime());