From 20956b0f05f81ca47cf6c3e8f9b3b426e9cfd035 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期日, 24 九月 2023 21:54:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/mom/pojo/dto/MaterialDto.java | 4 ++--
1 files changed, 2 insertions(+), 2 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..72e22a0 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
@@ -15,8 +15,8 @@
private Integer type;
@JsonSerialize
- @NotNull(message = "浜у搧澶х被(4澶х被)涓嶈兘涓虹┖")
- private Integer father;
+ @NotBlank(message = "浜у搧澶х被涓嶈兘涓虹┖")
+ private String father;
@JsonSerialize
@NotBlank(message = "鐗╂枡鍚嶇О涓嶈兘涓虹┖")
--
Gitblit v1.9.3