Merge remote-tracking branch 'remotes/origin/develop'

cuijian

2023-08-19 bdd0875d4b13a3f1ef472f64d4b6a95e0ef64b22

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcNoplanCloseServiceImpl.java

@@ -294,7 +294,7 @@
            queryWrapper.like(MdcNoplanClose::getEquipmentId, mdcNoplanClose.getEquipmentId());
        }
        if (StringUtils.isNotEmpty(mdcNoplanClose.getEquipmentName())) {
            queryWrapper.like(MdcNoplanClose::getEquipmentId, mdcNoplanClose.getEquipmentId());
            queryWrapper.like(MdcNoplanClose::getEquipmentName, mdcNoplanClose.getEquipmentName());
        }
        if (mdcNoplanClose.getEndTime() != null) {
            queryWrapper.le(MdcNoplanClose::getStartTime, mdcNoplanClose.getEndTime());