From 1e379e4d0b46db309646de017c7fe06eababbc6a Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 17 Mar 2022 09:40:56 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E6=B7=BB=E5=8A=A0=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=85=8D=E7=BD=AE=20=E5=88=97=E5=AE=BD"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit ebbd8482 --- .../main/java/com/epmet/dto/result/TableHeaderResultDTO.java | 1 - .../db/migration/V0.0.14__ic_form_query_add_witdh.sql | 2 -- .../src/main/resources/mapper/IcFormItemDao.xml | 3 +-- 3 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.14__ic_form_query_add_witdh.sql diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/TableHeaderResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/TableHeaderResultDTO.java index fbe06770ad..dd39f668e7 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/TableHeaderResultDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/TableHeaderResultDTO.java @@ -17,7 +17,6 @@ public class TableHeaderResultDTO implements Serializable { private String label; private String columnName; private String itemType; - private Integer width; private List options; } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.14__ic_form_query_add_witdh.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.14__ic_form_query_add_witdh.sql deleted file mode 100644 index b4563ed03c..0000000000 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.14__ic_form_query_add_witdh.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE `epmet_oper_customize`.`ic_form_query_builder` - ADD COLUMN `WIDTH` int(3) NULL COMMENT '列宽' AFTER `QUERY_TYPE`; diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml index 8ac6634525..9af84eaee4 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml @@ -77,8 +77,7 @@ m.id as item_id, m.LABEL, m.COLUMN_NAME, - m.item_type, - m.width + m.item_type FROM ic_form_item m WHERE