Merge remote-tracking branch 'origin/master'

rk

2025-08-21 c76bbf920f7ea32d2c604cdc529b865950ea24ac

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

@@ -20,6 +20,7 @@
@TableName("`order_log`")
public class OrderLog {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")
    @ExcelColumn(name="主键")
    private Integer id;