Merge remote-tracking branch 'origin/master'

tangzy

2022-07-18 6d7633051dc592f80b7967e34fa6e34f340f899d

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