From c313a253b1fcdc75b6be5db575fc2b29fb407021 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 15 四月 2026 20:05:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/services/src/main/java/com/doumee/dao/business/model/OrderLog.java |   78 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 78 insertions(+), 0 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/dao/business/model/OrderLog.java b/server/services/src/main/java/com/doumee/dao/business/model/OrderLog.java
new file mode 100644
index 0000000..ae40e38
--- /dev/null
+++ b/server/services/src/main/java/com/doumee/dao/business/model/OrderLog.java
@@ -0,0 +1,78 @@
+package com.doumee.dao.business.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 璁㈠崟鎿嶄綔鏃ュ織
+ * @author rk
+ * @date 2026/04/13
+ */
+@Data
+@ApiModel("璁㈠崟鎿嶄綔鏃ュ織")
+@TableName("`order_log`")
+public class OrderLog {
+
+    @TableId(type = IdType.AUTO)
+    @ApiModelProperty(value = "涓婚敭", example = "1")
+    private Integer id;
+
+    @ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "0")
+    private Integer deleted;
+
+    @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
+    private Integer createUser;
+
+    @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
+    private Integer updateUser;
+
+    @ApiModelProperty(value = "鏇存柊鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "澶囨敞")
+    private String remark;
+
+    @ApiModelProperty(value = "璁㈠崟涓婚敭锛坥rders锛�", example = "1")
+    private Integer orderId;
+
+    @ApiModelProperty(value = "鏍囬")
+    private String title;
+
+    @ApiModelProperty(value = "鏃ュ織鍐呭")
+    private String logInfo;
+
+    @ApiModelProperty(value = "鎿嶄綔绫诲瀷")
+    private Integer objType;
+
+    @ApiModelProperty(value = "鎿嶄綔浜�")
+    private Integer optUserId;
+
+    @ApiModelProperty(value = "鎿嶄綔浜哄悕绉�")
+    private String optUserName;
+
+    @ApiModelProperty(value = "鎿嶄綔鍓嶆暟鎹�")
+    private String beforeInfo;
+
+    @ApiModelProperty(value = "鎿嶄綔鍚庢暟鎹�")
+    private String afterInfo;
+
+    @ApiModelProperty(value = "璁㈠崟鐘舵��:0=寰呮帴鍗�;1=宸叉帴鍗�;2=杩涜涓�;3=宸插畬鎴�;99=宸插彇娑�;", example = "0")
+    private Integer orderStatus;
+
+    @ApiModelProperty(value = "鎿嶄綔浜虹被鍨嬶細0=鐢ㄦ埛锛�1=鍙告満锛�2=闂ㄥ簵锛�3=绯荤粺绠$悊鍛�", example = "0")
+    private Integer optUserType;
+
+}

--
Gitblit v1.9.3