Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyuji

2024-09-06 1e9a52cf65f364b4332a008210700adbaea0c35e

 north-glass-erp/src/main/java/com/example/erp/service/pp/ReworkService.java

@@ -160,7 +160,13 @@
            }
        }


        //保存日志
        Log log = new Log();
        log.setContent(object.toString());
        log.setFunction("updateRework返工审核");
        log.setOperatorId((String) object.get("userId"));
        log.setOperator((String) object.get("userName"));
        logService.saveLog(log);
        return saveState;

    }