Merge branch 'dev_neo' into 'dev'

[DEV] project query db filed fixed

See merge request root/atms!36

atms-api/src/main/java/pwc/taxtech/atms/dao/ProjectMapper.java

@@ -149,7 +149,7 @@ public interface ProjectMapper extends MyMapper {
             "        JOIN " +
             "    Industry industry ON p.IndustryID = industry.ID " +
             "        JOIN " +
-            "    TemplateGroup templateGroup ON projectServiceType.TemplateGroupID = templateGroup.ID " +
+            "    template_group templateGroup ON projectServiceType.TemplateGroupID = templateGroup.id " +
             "        JOIN " +
             "    Region region ON p.RegionID = region.ID " +
             "        JOIN " +