Merge remote-tracking branch 'origin/master'

jiangping

2025-07-18 22603b2519b8dcb7f9a7c7d9ba636d9aba240a59

 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;