Merge remote-tracking branch 'origin/master'

lin

2024-03-23 b3a0e5051c2923b5e12b059b6634aa9bd12db59b

 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;
}