Merge remote-tracking branch 'origin/master'

jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiAttendanceInformationController.java

@@ -165,7 +165,8 @@ public class BsSgcJsjdBuiAttendanceInformationController extends BaseController
     @ApiOperation("农民工人员考勤信息模板生成")
     public AjaxResult tagTemplate() {
         ExcelUtil<BsSgcJsjdBuiAttendanceInformationExcel> util = new ExcelUtil<>(BsSgcJsjdBuiAttendanceInformationExcel.class);
-        return util.exportExcel(null,"农民工人员考勤信息导入模板");
+        List<BsSgcJsjdBuiAttendanceInformationExcel> list = new ArrayList<>();
+        return util.exportExcel(list,"农民工人员考勤信息导入模板");
     }
 
 }

jwtech-system/src/main/java/com/kms/build/domain/vo/BsSgcJsjdBuiAttendanceInformationExcel.java

@@ -12,21 +12,21 @@ public class BsSgcJsjdBuiAttendanceInformationExcel {
 
     @Excel(name = "身份证号码")
     @ApiModelProperty("身份证号码")
-    private String name;
+    public String name;
 
     /** 考勤所属年月 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "考勤所属年月", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "考勤所属年月", width = 30, dateFormat = "yyyy-MM")
     @ApiModelProperty("考勤所属年月")
-    private Date attendanceYear;
+    public Date attendanceYear;
 
     @Excel(name = "身份证")
     @ApiModelProperty("身份证")
-    private String idNo;
+    public String idNo;
 
     @Excel(name = "考勤天数")
     @ApiModelProperty("考勤天数")
-    private String attendanceDay;
+    public String attendanceDay;