Merge remote-tracking branch 'origin/master'

zengh

2022-07-13 3d4cbf0b3534da14db4a57f8bdafe2125b3b8678

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