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

guoyuji

2024-10-23 fea188972674c312025095710d10658ed91329b6

 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);