Merge remote-tracking branch 'origin/master'

zengh

2022-07-09 d48d6e9bb0bb48f8338798d8a2cba60396e16698

 src/main/java/org/springblade/modules/stockrecord/entity/Stockrecord.java

@@ -81,6 +81,7 @@
   private Integer stockType1;
   private String sp1;
   private String sp2;
   private String deptId;
   private Long sid;
   private Double census;
}