From 6269dc7a50d5028fa616b339cfe790b6e0d5d16e Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Wed, 16 Jul 2025 18:20:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin
---
oying-system/src/main/java/com/oying/modules/sh/domain/OrderOperationLog.java | 24 ++++++++++++++----------
1 files changed, 14 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..f837d29 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,37 @@
@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 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