Merge remote-tracking branch 'origin/master'

zengh

2022-02-21 7722aa86f1a0e2aacbf2fd17203789619e1c64e3

 src/main/java/org/springblade/modules/trar/entity/Trar.java

@@ -41,7 +41,7 @@

   private static final long serialVersionUID = 1L;

   private Integer id;
   private Long id;
   /**
    * 任务id
    */