From 6a0f351816523dc305193779c4bdf48afd940555 Mon Sep 17 00:00:00 2001 From: luozukai Date: Fri, 30 Aug 2019 16:17:31 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E8=B4=A6=E5=8D=95=E7=BB=93=E7=AE=97]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migration/V201908301605__L_CONTRACT.sql | 21 +++++++++++++++++++ .../main/resources/mapper/WxBillAllMapper.xml | 1 - 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201908301605__L_CONTRACT.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201908301605__L_CONTRACT.sql b/mallinkAdmin/src/main/resources/db/migration/V201908301605__L_CONTRACT.sql new file mode 100644 index 000000000..d7ebeb556 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201908301605__L_CONTRACT.sql @@ -0,0 +1,21 @@ +alter table wx_bill_rent +add column `freeze` SMALLINT (1) NULL DEFAULT 0 COMMENT '0正常1冻结'; + +alter table wx_bill_rent_deposit +add column `freeze` SMALLINT (1) NULL DEFAULT 0 COMMENT '0正常1冻结'; + +alter table wx_bill_property +add column `freeze` SMALLINT (1) NULL DEFAULT 0 COMMENT '0正常1冻结'; + +alter table wx_bill_property_deposit +add column `freeze` SMALLINT (1) NULL DEFAULT 0 COMMENT '0正常1冻结'; + +alter table wx_bill_daily +add column `freeze` SMALLINT (1) NULL DEFAULT 0 COMMENT '0正常1冻结'; + +alter table wx_bill_other +add column `freeze` SMALLINT (1) NULL DEFAULT 0 COMMENT '0正常1冻结'; + +alter table wx_bill_other_deposit +add column `freeze` SMALLINT (1) NULL DEFAULT 0 COMMENT '0正常1冻结'; + diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index f2782fb1d..7a940d70c 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -741,7 +741,6 @@ and m.name like concat('%', #{merchantName},'%') and rc.rent_shop_type = #{rentShopType} - order by ${sortColumns} order by m.id desc