From 1b1248f500a49f11f12c3cf9b469c300430b4514 Mon Sep 17 00:00:00 2001
From: p-honggang.li <p-honggang.li@pcitc.com>
Date: 星期一, 18 八月 2025 10:02:03 +0800
Subject: [PATCH] Merge branch 'master' of http://xearth.cn:6600/r/web-manage/web-manage-back
---
src/main/java/com/webmanage/dto/AddPointsFlowDTO.java | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/webmanage/dto/AddPointsFlowDTO.java b/src/main/java/com/webmanage/dto/AddPointsFlowDTO.java
index 5fbb5c0..4712c53 100644
--- a/src/main/java/com/webmanage/dto/AddPointsFlowDTO.java
+++ b/src/main/java/com/webmanage/dto/AddPointsFlowDTO.java
@@ -22,20 +22,28 @@
@NotNull(message = "鍗曚綅ID涓嶈兘涓虹┖")
private Long unitId;
- @ApiModelProperty("瑙勫垯绫诲瀷(鑾峰緱/娑堣垂)")
- @NotBlank(message = "瑙勫垯绫诲瀷涓嶈兘涓虹┖")
- private String ruleType;
+ @ApiModelProperty("瑙勫垯绫诲瀷(0鑾峰緱/1娑堣垂)")
+ @NotNull(message = "瑙勫垯绫诲瀷涓嶈兘涓虹┖")
+ private Integer ruleType;
- @ApiModelProperty("瑙勫垯鍚嶇О")
- @NotBlank(message = "瑙勫垯鍚嶇О涓嶈兘涓虹┖")
- private String ruleName;
+ @ApiModelProperty("绉垎瑙勫垯绫诲埆(璧勬簮璐＄尞銆佽祫婧愪紶鎾�佽祫婧愪氦鏄撱�佷氦娴佺ぞ鍖轰簰鍔�)")
+ @NotBlank(message = "瑙勫垯绫诲埆涓嶈兘涓虹┖")
+ private String category;
+
+ @ApiModelProperty("绉垎瑙勫垯绫诲埆(璧勬簮璐＄尞銆佽祫婧愪紶鎾�佽祫婧愪氦鏄撱�佷氦娴佺ぞ鍖轰簰鍔�)")
+ @NotBlank(message = "绉垎瑙勫垯缂栫爜")
+ private String ruleNameCode;
+
+ @ApiModelProperty("鏁版嵁绫荤洰)")
+ @NotBlank(message = "鏁版嵁绫荤洰涓嶈兘涓虹┖")
+ private String dataCategoty;
@ApiModelProperty("鍏宠仈璁㈠崟ID")
private String orderId;
- @ApiModelProperty("绉垎娴佹按鎻忚堪")
- private String description;
-
@ApiModelProperty("瑙﹀彂娆℃暟(榛樿涓�1)")
private Integer count = 1;
+
+ @ApiModelProperty("娴佹按鎻忚堪(鍙�夛紝涓嶅～鍒欎娇鐢ㄨ鍒欐弿杩�)")
+ private String description;
}
--
Gitblit v1.8.0