From c28d3bb363dde2afb44c168b93379b2bf6b1f67f Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 07 九月 2023 15:26:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
production-server/src/main/java/com/yuanchu/mom/pojo/dto/ManualTechnologyDto.java | 43 ++++++++++++-------------------------------
1 files changed, 12 insertions(+), 31 deletions(-)
diff --git a/production-server/src/main/java/com/yuanchu/mom/pojo/dto/ManualTechnologyDto.java b/production-server/src/main/java/com/yuanchu/mom/pojo/dto/ManualTechnologyDto.java
index 15789bf..56d28d7 100644
--- a/production-server/src/main/java/com/yuanchu/mom/pojo/dto/ManualTechnologyDto.java
+++ b/production-server/src/main/java/com/yuanchu/mom/pojo/dto/ManualTechnologyDto.java
@@ -1,46 +1,27 @@
package com.yuanchu.mom.pojo.dto;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
+import java.util.List;
@Data
//鏇存柊鎺掍骇(閫夋嫨璁惧)
public class ManualTechnologyDto {
- //宸ュ簭id
- @NotNull(message = "id涓嶈兘涓虹┖")
- @JsonSerialize
- private Integer id;
+ @NotBlank(message = "鎺掍骇寮�濮嬫棩鏈熶笉鑳戒负绌�")
+ @ApiModelProperty(value = "鎺掍骇寮�濮嬫棩鏈�", example = "2023-08-31", required = true, dataType = "date")
+ private String date;
- /**
- * 宸ュ簭鍚嶇О
- **/
- @NotBlank(message = "宸ュ簭鍚嶇О涓嶈兘涓虹┖")
- @JsonSerialize
- private String techname;
+ @NotNull(message = "鐢熶骇璁㈠崟Id涓嶈兘涓虹┖")
+ @ApiModelProperty(value = "鐢熶骇璁㈠崟Id", example = "3", required = true)
+ private Integer manOrdId;
- /**
- * 宸ュ簭鐖剁被
- **/
- @NotBlank(message = "宸ュ簭鐖剁被涓嶈兘涓虹┖")
- @JsonSerialize
- private String techfather;
+ @NotNull(message = "鎺掍骇鏁伴噺涓嶈兘涓虹┖")
+ @ApiModelProperty(value = "鎺掍骇鏁伴噺", example = "20", required = true)
+ private Integer schedulingNumber;
- /**
- * 璁惧缁�
- **/
- @NotBlank(message = "璁惧缁勪笉鑳戒负绌�")
- @JsonSerialize
- private String deviceGroup;
-
- /**
- * 鍏宠仈 璁惧id
- **/
- @NotNull(message = "璁惧id涓嶈兘涓虹┖")
- @JsonSerialize
- private Integer deviceId;
-
+ private List<ManualTechnologyDto1> orderProcess;
}
--
Gitblit v1.9.3