Merge remote-tracking branch 'origin/master'

zengh

2022-07-01 e37630cbd344bd3e9b95964df31e7c23338c0924

 src/main/java/org/springblade/modules/farm/vo/FarmingRecordVO.java

@@ -22,4 +22,5 @@
    * 操作类型名称
    */
   private String typeName;
   private Integer snum;
}