From 206f601b1f2a2e3cb0bf4f5dead01bec9077d8e9 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Thu, 04 Sep 2025 15:28:52 +0800
Subject: [PATCH] Merge branch 'xin' into pxb
---
oying-system/src/main/java/com/oying/modules/sh/domain/OrderOperationLog.java | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 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
index ea36f06..553f0dc 100644
--- 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
@@ -25,33 +25,41 @@
@ApiModelProperty(value = "主键")
private Long logId;
- @NotNull
- @ApiModelProperty(value = "用户id")
- private Long userId;
+ @NotBlank
+ @ApiModelProperty(value = "订单号")
+ private String orderNum;
+
+ @NotBlank
+ @ApiModelProperty(value = "用户账号")
+ private String username;
@NotBlank
@ApiModelProperty(value = "用户类型")
private String userType;
- @NotBlank
+ @NotNull
@ApiModelProperty(value = "用户操作")
- private String operation;
+ private Integer operation = 0;
+
+ @NotBlank
+ @ApiModelProperty(value = "类型")
+ private String operationType;
+
+ @NotBlank
+ @ApiModelProperty(value = "用户操作描述")
+ private String operationDescribe = "提交订单";
@NotBlank
@ApiModelProperty(value = "备注")
private String remark;
- @NotNull
+ @NotBlank
@ApiModelProperty(value = "操作时的订单快照")
private String snapshotData;
@NotNull
@ApiModelProperty(value = "操作时间")
private Timestamp operationTime;
-
- @NotNull
- @ApiModelProperty(value = "订单号")
- private String orderNum;
public void copy(OrderOperationLog source){
BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
--
Gitblit v1.9.3