From b919b454bccc18d67b7109a09357499d09211eac Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Thu, 17 Jul 2025 18:07:08 +0800
Subject: [PATCH] Merge branch 'xin' into pxb
---
oying-system/src/main/java/com/oying/modules/sh/domain/OrderOperationLog.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 78ff273..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
@@ -26,6 +26,10 @@
private Long logId;
@NotBlank
+ @ApiModelProperty(value = "订单号")
+ private String orderNum;
+
+ @NotBlank
@ApiModelProperty(value = "用户账号")
private String username;
@@ -45,17 +49,13 @@
@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