Merge remote-tracking branch 'origin/master' into master

zengh

2021-01-15 16f44651a78d00943aea51b26fc6a4f20518a648

 src/main/java/org/springblade/modules/jingdan/entity/Jingdan.java

@@ -129,6 +129,8 @@
      private String addvcd;
      private String rName;
      private String handletype;
      private String czTime;
      private String bz;