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

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java

@@ -2100,7 +2100,8 @@ public class MesEnumUtil {
         MES_SCATTER_PART_CFG_BOM(620, "scatterPartCfgBomExcelService", "车型散件配置清单导入"),
         MES_SPARE_PARTS(630, "sparePartsExcelService", "备件计划导入"),
         MES_JISA(640, "jisaExcelService", "JISA导入"),
-        MES_CONTROL_PLAN(650, "controlPlanExcelService", "控制计划导入");
+        MES_CONTROL_PLAN(650, "controlPlanExcelService", "控制计划导入"),
+        MES_HOLIDAY_VACATION(650, "holidayVacationExcelService", "节假日导入");
 
         private int value;
         private String service;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesHolidayVacation.java

@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/10/18 2:55 下午
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "MES_HOLIDAY_VACTION")
+@Api("节假日")
+public class MesHolidayVacation extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -1620451254243818560L;
+    @Column(name = "YEAR")
+    @ApiParam("年")
+    private String year;
+
+    @Column(name = "MONTH")
+    @ApiParam("月")
+    private String month;
+
+    @Column(name = "DAY")
+    @ApiParam("日")
+    private String day;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesHolidayVacationRepository.java

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesHolidayVacation;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2021/5/7 4:44 PM
+ * @Modify:
+ */
+public interface MesHolidayVacationRepository extends BaseRepository<MesHolidayVacation, Long> {
+}