merges code

pom.xml

@@ -183,6 +183,7 @@
             <groupId>joda-time</groupId>
             <artifactId>joda-time</artifactId>
         </dependency>
+<<<<<<< Updated upstream
 
         <dependency>
             <groupId>org.modelmapper</groupId>
@@ -201,6 +202,8 @@
             <artifactId>poi-ooxml</artifactId>
             <version>3.17</version>
         </dependency>
+=======
+>>>>>>> Stashed changes
         <dependency>
             <groupId>com.cronutils</groupId>
             <artifactId>cron-utils</artifactId>

src/main/java/com/viettel/campaign/model/Campaign.java

@@ -75,6 +75,7 @@ public class Campaign implements Serializable {
     private String dayOfWeek;
     @Column(name = "CURRENT_TIME_MODE")
     private Long currentTimeMode;
+    private Long currentTimeModel;
     @Column(name = "WRAPUP_TIME_CONNECT")
     private Long wrapupTimeConnect;
     @Column(name = "WRAPUP_TIME_DISCONNECT")