Merge remote-tracking branch 'origin/master'

zengh

2022-08-01 daa6dce26ec80c58a0013b73c44a409a96f4cfc7

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