From dfea866e55c725bd601ff84c92dff30f83057571 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 30 三月 2023 19:56:59 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsLocale.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsLocale.java b/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsLocale.java
index a67ea69..827ce29 100644
--- a/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsLocale.java
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsLocale.java
@@ -200,7 +200,7 @@
*/
@TableField("create_at")
@JsonProperty("CreateAt")
- private Long createAt;
+ private String createAt;
/**
* 鐘舵�乕1:涓�鑸洃娴嬬偣,2:鐗规畩鐩戞祴鐐�,99:搴熷純鐩戞祴鐐筣
@@ -360,14 +360,14 @@
*/
@TableField("created_at")
@JsonProperty("CreatedAt")
- private LocalDateTime createdAt;
+ private String createdAt;
/**
* 鏇存柊鏃堕棿
*/
@TableField("updated_at")
@JsonProperty("UpdatedAt")
- private LocalDateTime updatedAt;
+ private String updatedAt;
@TableField("health_code_value11")
@JsonProperty("HealthCodeValue11")
@@ -430,5 +430,6 @@
private String customerString;
@JsonProperty("Customer")
+ @TableField(exist = false)
private OdsLocaleCustomer customer;
}
--
Gitblit v1.8.0