Merge remote-tracking branch 'origin/master'

tangzy

2022-07-18 6d7633051dc592f80b7967e34fa6e34f340f899d

 src/main/java/org/springblade/modules/stock/vo/StockVO.java

@@ -35,5 +35,8 @@
   String dic1;
   String dic2;
   String spn;

   String agrname;
   Integer cnum;
   String codes;
   String year;
}