Merge remote-tracking branch 'origin/master'

zengh

2021-06-23 9a8d3f7ad2717fd6089e43fb5de9dc4815877d9b

 src/main/java/org/springblade/modules/wj/entity/Wj.java

@@ -60,4 +60,10 @@
   private Integer sid;


   /**
    * 类型  1：图片   2：视频
    */
   private Integer type;


}