From 2db2c1328008ae399d8d7af56c9c6dc67a47bce8 Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期六, 01 十一月 2025 11:22:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop_whxrwms' into devlop_whxrwms
---
rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 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 9dce202..a1f361b 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,19 +1,11 @@
package com.vincent.rsf.server.api.entity.dto;
-import com.alibaba.fastjson.JSONObject;
-import com.fasterxml.jackson.annotation.JsonFormat;
-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 org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
-import java.util.Date;
import java.util.Map;
/**
@@ -27,6 +19,9 @@
@Accessors(chain = true)
@ApiModel(value = "ReceiptDetlsDto", description = "鏀惰揣鏄庣粏淇℃伅")
public class ReceiptDetlsDto implements Serializable {
+
+ @ApiModelProperty("鏄庣粏ID")
+ private Long id;
@ApiModelProperty("鏀惰揣閫氱煡鍗�")
private String asnCode;
@@ -91,8 +86,11 @@
@ApiModelProperty("鎵╁睍瀛楁绱㈠紩")
private String fieldsIndex;
+ @ApiModelProperty("琛屽彿")
+ private String platItemId;
+
@ApiModelProperty("鎵╁睍瀛楁")
- private Map<String, Object> extendFields;
+ private Map<String, String> extendFields;
}
--
Gitblit v1.9.1