Merge remote-tracking branch 'origin/master'

lin

2024-03-20 70a29ae28b85643e00a4b7fbf111a95646a24dc2

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

@@ -69,8 +69,8 @@

   /** 是否已删除 */
   @ApiModelProperty(value = "是否已删除", example = "")
   @TableField("is_delete")
   private Integer isDelete;
   @TableField("is_deleted")
   private Integer isDeleted;

   /** 创建人 */
   @ApiModelProperty(value = "创建人", example = "")