Merge branch 'feature/1219_opt' of http://git.dayaedu.com/yonge/cooleshow into test

toolset/utils/src/main/java/com/yonge/toolset/utils/date/DateUtil.java

@@ -1299,13 +1299,22 @@ public class DateUtil {
 		List<String> monthList = new ArrayList<>();
 		Calendar calendar = Calendar.getInstance();
 		calendar.setTime(startDate);
-		while (!calendar.getTime().after(endDate)) {
+
+		Calendar endCalendar = Calendar.getInstance();
+		endCalendar.setTime(endDate);
+
+		while (calendar.get(Calendar.YEAR) < endCalendar.get(Calendar.YEAR) ||
+				(calendar.get(Calendar.YEAR) == endCalendar.get(Calendar.YEAR) &&
+						calendar.get(Calendar.MONTH) <= endCalendar.get(Calendar.MONTH))) {
 			monthList.add(DateUtil.format(calendar.getTime(), "yyyy-MM"));
 			calendar.add(Calendar.MONTH, 1);
 		}
+
 		return monthList;
 	}
 
+
+
 	public static List<String> getYearList(Date startDate, Date endDate) {
 		List<String> yearList = new ArrayList<>();
 		Calendar calendar = Calendar.getInstance();