From 3e49ff6a3db6710bc327d99384d4b8fc6d474da4 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 27 六月 2024 13:44:09 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeGeneral.java | 41 ++++++++++++++++++++++++-----------------
1 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeGeneral.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeGeneral.java
index 7504a19..b3943e2 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeGeneral.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeGeneral.java
@@ -33,51 +33,58 @@
public static final long serialVersionUID = 202401241912001L;
/**
- * 涓婚敭
- */
+ * 涓婚敭
+ */
@JSONField(serializeUsing= ObjectWriterImplToString.class)
@TableId(type = IdType.INPUT)
@Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Long id;
/**
- * 鏀堕摱鍛樺鍚�
- */
+ * 鏀堕摱鍛業D
+ */
+ @Schema(description = "鏀堕摱鍛業D", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @NotNull(message = "鏀堕摱鍛業D涓嶈兘涓虹┖")
+ private Long cashierId;
+
+ /**
+ * 鏀堕摱鍛樺鍚�
+ */
@Schema(description = "鏀堕摱鍛樺鍚�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@NotBlank(message = "鏀堕摱鍛樺鍚嶄笉鑳戒负绌�")
private String cashierName;
/**
- * 瀹炴敹閲戦
- */
+ * 瀹炴敹閲戦
+ */
@Schema(description = "瀹炴敹閲戦", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@NotNull(message = "瀹炴敹閲戦涓嶈兘涓虹┖")
private Double tradeAmount;
/**
- * 璧犻�侀噾棰�
- */
+ * 璧犻�侀噾棰�
+ */
@Schema(description = "璧犻�侀噾棰�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@NotNull(message = "璧犻�侀噾棰濅笉鑳戒负绌�")
private Double gift;
/**
- * 鎬婚
- */
- @Schema(description = "鎬婚", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @NotNull(message = "鎬婚涓嶈兘涓虹┖")
- private Double totalAmount;
+ * 杩旇繕閲戦
+ */
+ @Schema(description = "杩旇繕閲戦", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @NotNull(message = "杩旇繕閲戦涓嶈兘涓虹┖")
+ private Double refundAmount;
/**
- * 浜ゆ槗鏃ユ湡
- */
+ * 浜ゆ槗鏃ユ湡
+ */
@Schema(description = "浜ゆ槗鏃ユ湡", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@NotNull(message = "浜ゆ槗鏃ユ湡涓嶈兘涓虹┖")
private Date operateDate;
/**
- * 瀹℃牳鐘舵��;1-鏈鏍革紝2-鍚屾剰锛�3-椹冲洖
- */
+ * 瀹℃牳鐘舵��;1-鏈鏍革紝2-鍚屾剰锛�3-椹冲洖
+ */
@Schema(description = "瀹℃牳鐘舵��", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@Max(message = "瀹℃牳鐘舵�佹渶澶т负3", value = 3)
@Min(message = "瀹℃牳鐘舵�佹渶灏忎负1",value = 1)
--
Gitblit v1.8.0