Merge remote-tracking branch 'origin/master'

zhongrj

2024-03-11 7f3ee212eb210aba3a7da7d2cb4a8d1af2f56116

 src/main/java/org/springblade/modules/smsTemplate/entity/SmsTemplateEntity.java

@@ -94,6 +94,6 @@
    * 0:否 1：是
    */
   @ApiModelProperty(value = "0:否 1：是", example = "")
   @TableField("is_delete")
   private String isDelete;
   @TableField("is_deleted")
   private String isDeleted;
}