From 86d368337175a7d7eed5e9330bd80a838ab4f396 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 09 十一月 2023 17:25:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/igds-api-gateway' into igds-api-gateway
---
src/main/java/com/fzzy/push/gd2022/dto/GDFinanceDto.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/fzzy/push/gd2022/dto/GDFinanceDto.java b/src/main/java/com/fzzy/push/gd2022/dto/GDFinanceDto.java
index 8654939..e74098f 100644
--- a/src/main/java/com/fzzy/push/gd2022/dto/GDFinanceDto.java
+++ b/src/main/java/com/fzzy/push/gd2022/dto/GDFinanceDto.java
@@ -1,6 +1,7 @@
package com.fzzy.push.gd2022.dto;
import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.io.Serializable;
@@ -12,6 +13,9 @@
@PropertyDef(label = "鍗曚綅浠g爜")
private String dwdm;
+ @PropertyDef(label = "搴撳尯浠g爜")
+ private String kqdm;
+
@PropertyDef(label = " 鎶ヨ〃鏈熷彿")
private String bbsj;
@@ -19,7 +23,8 @@
private String bbm;
@PropertyDef(label = " 鎸囨爣搴忓彿")
- private String zbxh;
+ @JsonProperty("Zbxh")
+ private Integer Zbxh;
@PropertyDef(label = " 鎸囨爣鍚嶇О")
private String zbmc;
@@ -36,11 +41,21 @@
@PropertyDef(label = " 鏈�鍚庢洿鏂版椂闂�")
private String zhgxsj;
+ @JsonProperty("Zbxh")
+ public void setZbxh(Integer zbxh) {
+ Zbxh = zbxh;
+ }
+
+ @JsonProperty("Zbxh")
+ public Integer getZbxh() {
+ return Zbxh;
+ }
+
public GDFinanceDto() {
}
- public GDFinanceDto(String zbxh, String zbmc, String zbz1, String zbz2) {
- this.zbxh = zbxh;
+ public GDFinanceDto(Integer zbxh, String zbmc, String zbz1, String zbz2) {
+ this.Zbxh = zbxh;
this.zbmc = zbmc;
this.zbz1 = zbz1;
this.zbz2 = zbz2;
--
Gitblit v1.9.3