Merge remote-tracking branch 'origin/master'

Houjie

2025-06-15 5e6c3ac5d7c7a2702a0bad5195e954c9e95d2306

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

@@ -99,6 +99,11 @@
        return this.baseMapper.findByEquipmentAndMonth(equipmentId, date);
    }

    @Override
    public List<MdcEquipmentStatisticalDto> findShiftByEquipmentAndMonth(String equipmentId, String date) {
        return this.baseMapper.findShiftByEquipmentAndMonth(equipmentId, date);
    }

    @Transactional(readOnly = true)
    public List<MdcEquipmentStatisticalShiftInfo> equipmentShiftStatisticalProcess(Equipment equipment, String dateTime) {
        Date initDate = null;