Merge remote-tracking branch 'origin/master'

zengh

2022-07-20 2af6fc082247372eb11fb54320345c0fcfa26518

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

@@ -37,5 +37,6 @@
   String spn;
   String agrname;
   Integer cnum;

   String codes;
   String year;
}