好礼兑换结束时间拼接23点59分59秒

happy-job-module-hpvip/src/main/java/com/jeeplus/modules/mpmanager/web/MpCompaignsRewardSettingController.java

@@ -122,8 +122,8 @@ public class MpCompaignsRewardSettingController extends BaseController {
 		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		SimpleDateFormat sdf1=new SimpleDateFormat("yyyy-MM-dd");
 		if(mpCompaignsRewardSetting.getExchangeStartDate()==null){
-			mpCompaignsRewardSetting.setExchangeStartDate(sdf.parse("1900-01-01"));
-			mpCompaignsRewardSetting.setExchangeEndDate(sdf.parse("2100-01-01"));
+			mpCompaignsRewardSetting.setExchangeStartDate(sdf.parse("1900-01-01 00:00:00"));
+			mpCompaignsRewardSetting.setExchangeEndDate(sdf.parse("2100-01-01 23:59:59"));
 		}else{
 			String time=sdf1.format(mpCompaignsRewardSetting.getExchangeEndDate())+" 23:59:59";
 			mpCompaignsRewardSetting.setExchangeEndDate(sdf.parse(time));