Merge branch 'master' of http://bore.pub:10439/r/ERP_override

guoyuji

2024-11-23 a6f59f0908e5787d55c098c17f4eec365cf6477a

 north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialStoreService.java

@@ -60,6 +60,8 @@
            }

            Log log = new Log();
            log.setOperatorId(object.get("userId").toString());
            log.setOperator(object.get("userName").toString());
            log.setContent(object.toString());

            DecimalFormat decimalFormat = new DecimalFormat("#0.00");
@@ -123,6 +125,8 @@

            }
            Log log = new Log();
            log.setOperatorId(object.get("userId").toString());
            log.setOperator(object.get("userName").toString());
            log.setContent(object.toString());
            log.setFunction("deleteMaterialStore删除："+id);
            logService.saveLog(log);