Merge remote-tracking branch 'origin/master'

zengh

2022-07-19 ec09030f0730809145c97bfaa0bd0387a7d990bf

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