Merge branch 'dev_cr' into dev

zhuo

2025-03-04 a3d51976f721767c14e231d42abbb7fc970f8de5

 performance-server/src/main/java/com/ruoyi/performance/service/impl/AuxiliaryWorkingHoursServiceImpl.java

@@ -35,6 +35,11 @@

    @Override
    public int deleteAuxiliaryWorkingHours(Integer id) {
        // 判断日工时管理中是否已绑定待删除辅助工时配置
        int count = auxiliaryWorkingHoursMapper.hourDayBindAuxiliaryCount(id);
        if(count > 0){
            throw new RuntimeException("已在日工时管理中绑定，禁止删除！");
        }
        return auxiliaryWorkingHoursMapper.deleteById(id);
    }