Merge remote-tracking branch 'origin/master'

guoshilong

2022-08-12 be9da335cb28e12e1439c24e4596f069e342d83f

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

@@ -38,5 +38,5 @@
   String agrname;
   Integer cnum;
   String codes;

   String year;
}