Merge remote-tracking branch 'origin/master'

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

@@ -43,7 +43,7 @@ public class BsSgcJsjdBuiAttendanceInformation extends BaseEntity
     private String name;
 
     /** 考勤所属年月 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM")
     @Excel(name = "考勤所属年月", width = 30, dateFormat = "yyyy-MM-dd")
     @ApiModelProperty("考勤所属年月")
     private Date attendanceYear;