From a57a39de178fcc2bda213e7791d61d2570c4831e Mon Sep 17 00:00:00 2001 From: zengh <123456> Date: Fri, 15 Jul 2022 14:27:22 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/java/org/springblade/modules/stock/controller/StockController.java | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/main/java/org/springblade/modules/stock/controller/StockController.java b/src/main/java/org/springblade/modules/stock/controller/StockController.java index 29d331c..d1b9329 100644 --- a/src/main/java/org/springblade/modules/stock/controller/StockController.java +++ b/src/main/java/org/springblade/modules/stock/controller/StockController.java @@ -245,7 +245,6 @@ double v1 = lycknum + dbcknum + bfcknum; pages.getRecords().get(i).setCknum(v1); } - return R.data(pages); } -- Gitblit v1.9.3