Merge remote-tracking branch 'origin/master'

zengh

2021-12-04 2fdf30b77e0614f4785c7893a01958e8c8db8545

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

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


}