Merge branch 'dev' into dev_zj

zss

2025-03-06 fd7bc95a3c91fb7d90a921b0ff762fa6095fabd1

 cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessDealServiceImpl.java

@@ -76,8 +76,8 @@
    @Override
    public int delProcessDeal(Integer id) {
        ProcessDeal processDeal = processDealMapper.selectById(id);
        processDealMapper.deleteById(id);
        ProcessTotaldeal processTotaldeal = processTotaldealMapper.selectById(processDeal.getTotaldealId());
        processDealMapper.deleteById(id);
        processTotaldeal.setTotalNum(processTotaldeal.getTotalNum()-processDeal.getNum());
        return processTotaldealMapper.updateById(processTotaldeal);
    }