From 3594a911312b92561b08c478ef0319cf1ae2b0d8 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 11 九月 2023 11:20:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/mom/pojo/dto/MaterialDto.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/mom/pojo/dto/MaterialDto.java b/standard-server/src/main/java/com/yuanchu/mom/pojo/dto/MaterialDto.java
index 6d43cad..4cfa724 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/pojo/dto/MaterialDto.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/pojo/dto/MaterialDto.java
@@ -16,7 +16,7 @@
@JsonSerialize
@NotNull(message = "浜у搧澶х被(4澶х被)涓嶈兘涓虹┖")
- private Integer father;
+ private String father;
@JsonSerialize
@NotBlank(message = "鐗╂枡鍚嶇О涓嶈兘涓虹┖")
--
Gitblit v1.9.3