From 66ff6f509bbbba04cffc428e7e1c886b534b4f13 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 17 八月 2023 17:09:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/mom/pojo/Technology.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/mom/pojo/Technology.java b/standard-server/src/main/java/com/yuanchu/mom/pojo/Technology.java
index c1754bd..c9f0d0a 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/pojo/Technology.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/pojo/Technology.java
@@ -34,7 +34,8 @@
@ApiModelProperty(value = "宸ヨ壓鍚嶇О")
private String name;
- private String quota;
+ @ApiModelProperty(value = "鐖剁骇")
+ private String father;
@ApiModelProperty(value = "璁惧缁�")
private String deviceGroup;
@@ -56,8 +57,6 @@
@ApiModelProperty(value = "鍏宠仈 瑙勬牸id")
private Integer specificationsId;
- @ApiModelProperty(value = "鍏宠仈 璁惧id")
- private Integer deviceId;
}
--
Gitblit v1.9.3