Merge branch 'dev_import' into develop

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/CommunitySelfOrgImportExcel.java

@@ -0,0 +1,37 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+/**
+ * 社会自组织导入错误数据存放文件
+ * @author  sun
+ */
+@Data
+public class CommunitySelfOrgImportExcel {
+
+    @Excel(name = "组织名称", width = 40)
+    private String agencyName;
+    @Excel(name = "社会组织名称", width = 40)
+    private String societyName;
+    @Excel(name = "错误信息", width = 50)
+    private String errorInfo;
+
+}

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/excel/PartyMemberImportExcel.java

@@ -0,0 +1,40 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.partymember.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+/**
+ * 党员风采导入错误数据存放文件
+ * @author  sun
+ */
+@Data
+public class PartyMemberImportExcel {
+
+    @Excel(name = "所属网格", width = 30)
+    private String gridName;
+    @Excel(name = "党员姓名", width = 20)
+    private String name;
+    @Excel(name = "主要事迹", width = 30)
+    private String mainDeed;
+    @Excel(name = "所属分类", width = 30)
+    private String categoryName;
+    @Excel(name = "错误信息", width = 40)
+    private String errorInfo;
+}