Merge remote-tracking branch 'origin/master'

tangzy

2021-09-23 96d31712c6654b2b71ed04696a9bb30af4d7f79a

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

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


}