From 509e438edbe3a1ab27a0e1281535e3c553b04dd5 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期三, 16 八月 2023 17:37:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/BaseModel.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/BaseModel.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/BaseModel.java
index 8c14eab..a54c3e5 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/BaseModel.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/BaseModel.java
@@ -1,11 +1,12 @@
 package com.vci.ubcs.codeapply.object;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import org.springframework.data.annotation.Transient;
 
 import java.util.Date;
 import java.util.Map;
-
+@JsonIgnoreProperties
 public class BaseModel {
 	private String oid;
 	private String id;

--
Gitblit v1.9.3