From 72fe6f7da4a4cdcd4e086f5ca1a1e82b93551513 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期四, 30 七月 2026 09:19:22 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java
index 2e8e047..445c868 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java
@@ -181,7 +181,7 @@
/** 绛剧讲鏃ユ湡 */
@ApiModelProperty("绛剧讲鏃ユ湡")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "绛剧讲鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date signdate;
@@ -195,12 +195,10 @@
@ApiModelProperty("瀛﹀巻")
private String education;
-
-
- /** 鑱屼笟 */
+ /**
+ * 鑱屼笟
+ */
@ApiModelProperty("鑱屼笟")
- private String work;
-
-
+ private String occupation;
}
--
Gitblit v1.9.3