From f47844c608afc6f5e21d882061cf1ca3a10d6301 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 26 四月 2024 13:44:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java
index a053a68..7b8274d 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java
@@ -42,13 +42,16 @@
@ApiModelProperty("杩愮淮鍗曚綅")
private Integer unitId;
- @NotBlank(message = "杩愮淮鐘舵�佷笉鑳戒负绌�", groups = {Add.class, Update.class})
+// @NotBlank(message = "杩愮淮鐘舵�佷笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("杩愮淮鐘舵��")
private String status;
- @NotBlank(message = "澶囨敞涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("澶囨敞")
- private String remark;
+
+ private String pointDetail;
+
+// @NotBlank(message = "澶囨敞涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+// @ApiModelProperty("澶囨敞")
+// private String remark;
public static YwPoint getEntityByForm(@NonNull YwPointForm form, YwPoint entity) {
if(entity == null) {
--
Gitblit v1.8.0