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

jiangping

2025-02-19 c977f0e2fd86ca3e9e3ad3961f702206c41d2767

 server/services/src/main/java/com/doumee/dao/business/model/DiscountLog.java

@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;

import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -79,4 +80,8 @@
    @ExcelColumn(name="关联订单编码(关联goodsorder）")
    private String goodsorderId;

    @ApiModelProperty(value = "创建人名称")
    @TableField(exist = false)
    private String creatorName;

}