From 3bd07e5f90d5d832b8502252e1daebdd014320f8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 19 三月 2025 10:28:49 +0800
Subject: [PATCH] Merge branch 'front' into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java
index ae83305..426cf07 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java
@@ -1,12 +1,17 @@
package com.vincent.rsf.server.api.entity.dto;
-import io.swagger.annotations.Api;
+import com.alibaba.fastjson.JSONObject;
+import com.vincent.rsf.server.api.controller.params.ReceiptParams;
+import com.vincent.rsf.server.common.utils.CommonUtil;
+import com.vincent.rsf.server.common.utils.FieldsUtils;
+import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
+import java.util.Map;
/**
* @author Ryan
@@ -30,7 +35,7 @@
private String poCode;
@ApiModelProperty("鐗╂枡鍚嶇О")
- private String matnk;
+ private String maktx;
@ApiModelProperty("渚涘簲鍟嗘壒娆�")
private String splrBatch;
@@ -64,4 +69,22 @@
@ApiModelProperty("渚涘簲鍟嗙紪鐮�")
private String splrCode;
+
+ @ApiModelProperty("鎵╁睍瀛楁")
+ private Map<String, Object> extendFields;
+
+ public static void main(String[] args) {
+ String abc = "";
+ String s = CommonUtil.randomUUID16();
+ System.out.println("閲嶅瀛楃涓诧細" + s);
+// for (int i = 0; i < 10000; i++) {
+// String s = CommonUtil.randomUUID16();
+// if (abc.equals(s)) {
+// System.out.println("閲嶅瀛楃涓诧細" + abc);
+// }
+// abc = s;
+// }
+ }
}
+
+
--
Gitblit v1.9.1