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

707b9abc · frank.xa.zhang · 91b2449a · 99301a45 · 707b9abc
Commit 707b9abc authored Jun 25, 2018 by frank.xa.zhang
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

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

No files found.
--- a/atms-api/src/main/java/pwc/taxtech/atms/dao/ProjectMapper.java
+++ b/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 " +