From c0fd46ed9c7ddf7a3ea4e6a972474e9a62c68a1a Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 22 七月 2024 19:59:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/java/com/yuanchu/mom/pojo/DataConfig.java | 13 ++-----------
1 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/DataConfig.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/DataConfig.java
index 254d103..a501281 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/pojo/DataConfig.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/DataConfig.java
@@ -32,15 +32,6 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty("鏂囦欢鍚庣紑")
- private String fileType;
-
- @ApiModelProperty("閲囬泦鍦板潃")
- private String collectUrl;
-
- @ApiModelProperty("瀛樺偍鍦板潃")
- private String storageUrl;
-
@ApiModelProperty("鍏紡")
private String formula;
@@ -51,10 +42,10 @@
private String refery;
@ApiModelProperty("x")
- private Integer x;
+ private String x;
@ApiModelProperty("y")
- private Integer y;
+ private String y;
@ApiModelProperty("璁惧id")
private Integer deviceId;
--
Gitblit v1.9.3