From c1d20b425b10e8ba59f102dd1ab413055883eed0 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Mon, 14 Jul 2025 16:57:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xin' into pxb

---
 oying-system/src/main/java/com/oying/modules/sh/domain/OrderOperationLog.java |   63 +++++++++++++++++++++++++++++++
 1 files changed, 63 insertions(+), 0 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/sh/domain/OrderOperationLog.java b/oying-system/src/main/java/com/oying/modules/sh/domain/OrderOperationLog.java
new file mode 100644
index 0000000..f837d29
--- /dev/null
+++ b/oying-system/src/main/java/com/oying/modules/sh/domain/OrderOperationLog.java
@@ -0,0 +1,63 @@
+package com.oying.modules.sh.domain;
+
+import lombok.Data;
+import cn.hutool.core.bean.BeanUtil;
+import io.swagger.annotations.ApiModelProperty;
+import cn.hutool.core.bean.copier.CopyOptions;
+import java.sql.Timestamp;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+/**
+* @description /
+* @author lixin
+* @date 2025-06-11
+**/
+@Data
+@TableName("sh_order_operation_log")
+public class OrderOperationLog implements Serializable {
+
+    @TableId(value = "log_id", type = IdType.AUTO)
+    @ApiModelProperty(value = "主键")
+    private Long logId;
+
+    @NotBlank
+    @ApiModelProperty(value = "订单号")
+    private String orderNum;
+
+    @NotBlank
+    @ApiModelProperty(value = "用户账号")
+    private String username;
+
+    @NotBlank
+    @ApiModelProperty(value = "用户类型")
+    private String userType;
+
+    @NotNull
+    @ApiModelProperty(value = "用户操作")
+    private Integer operation = 0;
+
+    @NotBlank
+    @ApiModelProperty(value = "用户操作描述")
+    private String operationDescribe = "提交订单";
+
+    @NotBlank
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @NotBlank
+    @ApiModelProperty(value = "操作时的订单快照")
+    private String snapshotData;
+
+    @NotNull
+    @ApiModelProperty(value = "操作时间")
+    private Timestamp operationTime;
+
+    public void copy(OrderOperationLog source){
+        BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
+    }
+}

--
Gitblit v1.9.3