Merge remote-tracking branch 'origin/master' into develop

zenglf

2023-09-28 f84d9e69907cb678150eaa6393fd74cf042fcca4

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

@@ -43,4 +43,9 @@
        lambdaQuery.orderByAsc(EquipmentLog::getCollectTime);
        return lambdaQuery.list();
    }

    @Override
    public EquipmentLog getRow(String equipmentid, Date startTime) {
        return this.baseMapper.getRow(equipmentid, startTime);
    }
}