Merge remote-tracking branch 'origin/dev_ztns' into dev_ztns

gongchunyi

13 小时以前 293dad30b91c26329aa165c6329220220e5bf8a1

Merge remote-tracking branch 'origin/dev_ztns' into dev_ztns

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

@@ -151,8 +151,8 @@
    //编辑
    @Override
    public int updateAuxiliaryWorkingHoursDay(AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay) {
        Integer userId = SecurityUtils.getUserId().intValue();
        auxiliaryWorkingHoursDay.setNameUser(userId);//姓名id
//        Integer userId = SecurityUtils.getUserId().intValue();
//        auxiliaryWorkingHoursDay.setNameUser(userId);//姓名id
        return auxiliaryWorkingHoursDayMapper.updateById(auxiliaryWorkingHoursDay);
    }