Merge branch 'dev_cr' into dev

zhuo

2025-03-07 1c482625154845f26379fb97d931b1cf72b2633c

Merge branch 'dev_cr' into dev

 cnas-require/src/main/java/com/ruoyi/require/controller/ProcurementSuppliesExpendsController.java

@@ -36,7 +36,7 @@
        Integer added = procurementSuppliesExpendsService.addExpends(dto);

        if ( added == 0) {
            return Result.fail("当前库存不足");
            throw new RuntimeException("当前库存不足");
        }
        return Result.success(added);
    }

 performance-server/src/main/resources/mapper/AuxiliaryWorkingHoursDayMapper.xml

@@ -62,7 +62,7 @@
    </select>
    <select id="selectListByIds" resultType="com.ruoyi.performance.pojo.AuxiliaryWorkingHoursDay">
        select * from auxiliary_working_hours_day
        where state='已审核'
        where state='已批准'
        <if test="ids !=null and ids != ''">
            and name_user in
            <foreach collection="ids" index="index" open="(" separator="," close=")" item="val">