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 | 49 +++++++++++++++++++------------------------------
1 files changed, 19 insertions(+), 30 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
index 23af747..ae40e38 100644
--- 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
@@ -1,19 +1,20 @@
package com.doumee.dao.business.model;
-import com.doumee.core.annotation.excel.ExcelColumn;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
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 lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
import java.util.Date;
/**
* 璁㈠崟鎿嶄綔鏃ュ織
- * @author 姹熻箘韫�
- * @date 2025/07/09 12:00
+ * @author rk
+ * @date 2026/04/13
*/
@Data
@ApiModel("璁㈠崟鎿嶄綔鏃ュ織")
@@ -22,68 +23,56 @@
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
- @ExcelColumn(name="涓婚敭")
private Integer id;
- @ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "1")
- @ExcelColumn(name="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
+ @ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "0")
private Integer deleted;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer createUser;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer updateUser;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @ExcelColumn(name="鏇存柊鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
@ApiModelProperty(value = "澶囨敞")
- @ExcelColumn(name="澶囨敞")
private String remark;
@ApiModelProperty(value = "璁㈠崟涓婚敭锛坥rders锛�", example = "1")
- @ExcelColumn(name="璁㈠崟涓婚敭锛坥rders锛�")
private Integer orderId;
@ApiModelProperty(value = "鏍囬")
- @ExcelColumn(name="鏍囬")
private String title;
@ApiModelProperty(value = "鏃ュ織鍐呭")
- @ExcelColumn(name="鏃ュ織鍐呭")
private String logInfo;
- @ApiModelProperty(value = "鎿嶄綔绫诲瀷", example = "1")
- @ExcelColumn(name="鎿嶄綔绫诲瀷")
+ @ApiModelProperty(value = "鎿嶄綔绫诲瀷")
private Integer objType;
- @ApiModelProperty(value = "鎿嶄綔浜�", example = "1")
- @ExcelColumn(name="鎿嶄綔浜�")
- private Integer memberId;
+ @ApiModelProperty(value = "鎿嶄綔浜�")
+ private Integer optUserId;
+
+ @ApiModelProperty(value = "鎿嶄綔浜哄悕绉�")
+ private String optUserName;
@ApiModelProperty(value = "鎿嶄綔鍓嶆暟鎹�")
- @ExcelColumn(name="鎿嶄綔鍓嶆暟鎹�")
private String beforeInfo;
@ApiModelProperty(value = "鎿嶄綔鍚庢暟鎹�")
- @ExcelColumn(name="鎿嶄綔鍚庢暟鎹�")
private String afterInfo;
- @ApiModelProperty(value = "璁㈠崟鐘舵��:0=寰呮帴鍗曪紱1=宸叉帴鍗曪紱2=杩涜涓紱3=宸插畬鎴愶紱99=宸插彇娑堬紱", example = "1")
- @ExcelColumn(name="璁㈠崟鐘舵��:0=寰呮帴鍗曪紱1=宸叉帴鍗曪紱2=杩涜涓紱3=宸插畬鎴愶紱99=宸插彇娑堬紱")
+ @ApiModelProperty(value = "璁㈠崟鐘舵��:0=寰呮帴鍗�;1=宸叉帴鍗�;2=杩涜涓�;3=宸插畬鎴�;99=宸插彇娑�;", example = "0")
private Integer orderStatus;
-
-
- @ApiModelProperty(value = "鎿嶄綔浜虹被鍨嬶細0=鍙戝崟鏂�;1=鎺ュ崟鏂�;2=绯荤粺;", example = "1")
- @ExcelColumn(name="鎿嶄綔浜虹被鍨嬶細0=鍙戝崟鏂�;1=鎺ュ崟鏂�;2=绯荤粺;")
+ @ApiModelProperty(value = "鎿嶄綔浜虹被鍨嬶細0=鐢ㄦ埛锛�1=鍙告満锛�2=闂ㄥ簵锛�3=绯荤粺绠＄悊鍛�", example = "0")
private Integer optUserType;
+
}
--
Gitblit v1.9.3