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