Merge branch 'maintenance_feature' into test

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentInstrumentServiceImpl.java

@@ -179,11 +179,11 @@ public class StudentInstrumentServiceImpl extends BaseServiceImpl<Long, StudentI
                 logger.error("产品协议生成失败", e);
             }
             Date startTime = nowDate;
-            Date endTime = DateUtil.addDays(DateUtil.addYears(nowDate, 1), -1);
+            Date endTime = DateUtil.addYears(nowDate, 1);
             if (studentInstrument.getEndTime() != null &&
                     studentInstrument.getEndTime().compareTo(nowDate) >= 0) {
                 startTime = studentInstrument.getStartTime();
-                endTime = DateUtil.addDays(DateUtil.addYears(studentInstrument.getEndTime(), 1), -1);
+                endTime = DateUtil.addYears(studentInstrument.getEndTime(), 1);
             }
             studentInstrument.setStartTime(startTime);
             studentInstrument.setEndTime(endTime);
@@ -280,7 +280,7 @@ public class StudentInstrumentServiceImpl extends BaseServiceImpl<Long, StudentI
             maintenanceDetail = orderDetails4Maintenance.get(0);
             maintenanceStatus = 1;
             startTime = new Date();
-            endTime = DateUtil.addDays(DateUtil.addYears(startTime, 1), -1);
+            endTime = DateUtil.addYears(startTime, 1);
         }
 
         Integer goodsId = Integer.valueOf(orderDetails4Instruments.get(0).getGoodsIdList());