From 5f72ddd4ca8a10d5dcb4e1ab79463593317ffbe6 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 28 八月 2023 14:22:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/mom/pojo/Technology.java | 4 +++-
1 files changed, 3 insertions(+), 1 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 c9f0d0a..21389a2 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
@@ -54,9 +54,11 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime;
- @ApiModelProperty(value = "鍏宠仈 瑙勬牸id")
+ @ApiModelProperty(value = "鍏宠仈 鍨嬪彿id")
private Integer specificationsId;
+ @ApiModelProperty(value = "鐢熶骇瀹氶(涓�/澶�)")
+ private Integer productionQuota;
}
--
Gitblit v1.9.3