Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

doum

2026-06-17 7ff92e90d2318f5c2597c4ba01e0cbfde983cec0

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

@@ -82,6 +82,10 @@
    @ExcelColumn(name="类型 0短信 1邮件")
    private Integer type;

    @ApiModelProperty(value = "H5登录角色 0运维 1商户")
    @TableField(exist = false)
    private Integer userType;

    @ApiModelProperty(value = "关联对象编码", example = "1")
    @ExcelColumn(name="关联对象编码")
    private Integer objId;