Merge remote-tracking branch 'origin/master'

jiangping

2024-12-23 c8fe78fea78d092b434924ef46630d27d671e80a

 server/system_service/src/main/java/com/doumee/dao/business/model/SmsEmail.java

@@ -78,7 +78,7 @@
    @ExcelColumn(name="状态 0未使用 1已使用 2等待发送")
    private Integer status;

    @ApiModelProperty(value = "类型 0短信 1邮件")
    @ApiModelProperty(value = "类型 0短信 1邮件 ")
    @ExcelColumn(name="类型 0短信 1邮件")
    private Integer type;