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

# Conflicts:
#	tduck-project/src/main/java/com/tduck/cloud/project/entity/ProjectTemplateItemEntity.java

tduck-project/src/main/java/com/tduck/cloud/project/entity/ProjectTemplateItemEntity.java

@@ -91,4 +91,5 @@ public class ProjectTemplateItemEntity extends BaseEntity<ProjectTemplateItemEnt
 
     private String moduleType;
     private String itemKey;
+
 }