Merge remote-tracking branch 'origin/master'

tangzy

2021-11-25 a9ec32e3db22fa4f5f44fa2b68e92862c1f58a5d

 src/main/java/org/springblade/modules/resource/entity/Attach.java

@@ -75,6 +75,7 @@
    */
   @TableField("notice_id")
   private Long noticeId;
   private String cardid;;


}