Merge remote-tracking branch 'origin/mode-min-unit' into mode-min-unit

cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/CheckItemsServiceImpl.java

@@ -285,7 +285,7 @@ public class CheckItemsServiceImpl extends ServiceImpl<CheckItemsDao, CheckItems
                 //设备名称
                 String checkitemname = ObjectUtil.isNotEmpty(checkItemsDo.getCheckitemname()) ? checkItemsDo.getCheckitemname() : "";
                 //下次检验日期
-                Date devicecheckdate = checkItemsDo.getDevicecheckdate();
+                Date devicecheckdate = checkItemsDo.getNextcheckdate();
                 String checkDate = "";
                 if (ObjectUtil.isNotEmpty(devicecheckdate)) {
                     checkDate = DateUtil.format(devicecheckdate, "yyyy-MM-dd");