From 3ce737b52fca082ac3a2ecda4a848e2e4abcd0ee Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 06 Jul 2023 09:38:18 +0800
Subject: [PATCH] Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttAdBase.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttAdBase.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttAdBase.java
index f147971..d28121f 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttAdBase.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttAdBase.java
@@ -27,6 +27,7 @@
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "主键")
@TableField("\"guid\"")
+ @TableId("\"guid\"")
private String guid;
/**
@@ -37,6 +38,13 @@
private String adCode;
/**
+ * 行政区划名称
+ */
+ @ApiModelProperty(value = "行政区划名称")
+ @TableField("\"ad_name\"")
+ private String adName;
+
+ /**
* 父主键
*/
@JsonSerialize(using = ToStringSerializer.class)
@@ -45,11 +53,12 @@
private String pAdCode;
/**
- * 行政区划名称
+ * 父名称
*/
- @ApiModelProperty(value = "行政区划名称")
- @TableField("\"ad_name\"")
- private String adName;
+ @JsonSerialize(using = ToStringSerializer.class)
+ @ApiModelProperty(value = "父名称")
+ @TableField("\"p_ad_name\"")
+ private String pAdName;
/**
* 行政区划等级
@@ -58,4 +67,11 @@
@TableField("\"ad_grad\"")
private String adGrad;
+ /**
+ * 排序
+ */
+ @ApiModelProperty(value = "排序")
+ @TableField("\"order_id\"")
+ private Integer orderId;
+
}
--
Gitblit v1.9.3