冲突修改

2023-05-16 09:51:37 +08:00
parent ffdec2152a
commit 708af80624
2 changed files with 2 additions and 7 deletions
--- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsEdDataPO.java
+++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsEdDataPO.java
@@ -86,10 +86,6 @@ public class CsEdDataPO extends BaseEntity {
    @TableField(value = "file_path")
    private String filePath;

-    /**
-     * 装置类型
-     */
-    @TableField(value = "type")
-    private String type;
+

 }
--- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsEdDataVO.java
+++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsEdDataVO.java
@@ -77,7 +77,6 @@ public class CsEdDataVO  extends BaseEntity {
    @ApiModelProperty(value = ".bin文件")
    private String filePath;

-    @ApiModelProperty(value = "type")
-    private String type;
+

 }