Merge remote-tracking branch 'origin/master'

guoshilong

2022-08-26 17cfbc75dc326f3e5963ee17c99d6516497f8cf1

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

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

   String codes;
   String year;
}