Merge remote-tracking branch 'origin/master'

lin

2024-03-23 b3a0e5051c2923b5e12b059b6634aa9bd12db59b

 src/main/java/org/springblade/modules/email/entity/EmailEntity.java

@@ -72,4 +72,7 @@
   @ApiModelProperty(value = "备注")
   private String remark;

   @ApiModelProperty(value = "1:发送配置 2：接收配置")
   private String emailType;

}