From 5d24aead2d1a45452942ddfc300fe6a232301a99 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 25 九月 2023 11:07:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
base-server/src/main/java/com/yuanchu/mom/pojo/dto/TechnologyTemplateDto.java | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/base-server/src/main/java/com/yuanchu/mom/pojo/dto/TechnologyTemplateDto.java b/base-server/src/main/java/com/yuanchu/mom/pojo/dto/TechnologyTemplateDto.java
index 1baefff..61b4fed 100644
--- a/base-server/src/main/java/com/yuanchu/mom/pojo/dto/TechnologyTemplateDto.java
+++ b/base-server/src/main/java/com/yuanchu/mom/pojo/dto/TechnologyTemplateDto.java
@@ -11,8 +11,8 @@
public class TechnologyTemplateDto {
@JsonSerialize
- @NotNull(message = "绫诲瀷涓嶈兘涓虹┖")
- private Integer type;
+ @NotBlank(message = "绫诲瀷涓嶈兘涓虹┖")
+ private String type;
@JsonSerialize
@NotBlank(message = "宸ュ簭涓嶈兘涓虹┖")
@@ -22,9 +22,6 @@
@NotBlank(message = "宸ヨ壓涓嶈兘涓虹┖")
private String name;
- @JsonSerialize
- @NotBlank(message = "鍏冧欢涓嶈兘涓虹┖")
- private String element;
@JsonSerialize
@NotBlank(message = "璁惧缁勪笉鑳戒负绌�")
--
Gitblit v1.9.3