From 6db5272e2df8a27942f10c03d93183fc9b01e22a Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 04 九月 2023 18:05:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
production-server/src/main/java/com/yuanchu/mom/pojo/ManualTechnology.java | 32 +++-----------------------------
1 files changed, 3 insertions(+), 29 deletions(-)
diff --git a/production-server/src/main/java/com/yuanchu/mom/pojo/ManualTechnology.java b/production-server/src/main/java/com/yuanchu/mom/pojo/ManualTechnology.java
index 012bca4..3373482 100644
--- a/production-server/src/main/java/com/yuanchu/mom/pojo/ManualTechnology.java
+++ b/production-server/src/main/java/com/yuanchu/mom/pojo/ManualTechnology.java
@@ -47,13 +47,8 @@
**/
private String deviceGroup;
- /**
- * 鍏宠仈 璁惧id
- **/
- private Integer deviceId;
-
- @ApiModelProperty(value = "鍏宠仈 宸ヨ壓Id")
- private Integer technologyId;
+ @ApiModelProperty(value = "鐢熶骇瀹氶(涓�/澶�)")
+ private Integer productionQuota;
/**
* 鍏宠仈 鐢熶骇璁㈠崟id
@@ -61,6 +56,7 @@
private Integer manufactureOrderId;
@ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0", hidden = true)
+ @TableLogic(value = "1", delval = "0")
private Integer state;
@TableField(fill = FieldFill.INSERT)
@@ -72,27 +68,5 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date updateTime;
-
- /**
- * 寮�濮嬫棩鏈�(璁″垝)
- */
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- private Date startTime;
-
- /**
- * 缁撴潫鏃ユ湡(璁″垝)
- */
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- private Date endTime;
-
- /**
- * 鍛ㄦ湡
- **/
- private Integer period;
-
- @ApiModelProperty(value = "鎺掍骇鏁伴噺")
- private Integer schedulingNumber;
}
--
Gitblit v1.9.3