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
4 years ago · 918d7bb802
1 changed files with 1 additions and 0 deletions
--- a/tduck-project/src/main/java/com/tduck/cloud/project/entity/ProjectTemplateItemEntity.java
+++ b/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;
+
 }