diff --git a/mallinkAdmin/src/main/resources/db/migration/V202504000000002.sql b/mallinkAdmin/src/main/resources/db/migration/V202504000000002.sql index 8e740aff4..f1446b4b1 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202504000000002.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202504000000002.sql @@ -39,12 +39,6 @@ alter table wx_rent_contract drop column first_bill_receive_date; alter table wx_rent_contract drop column agile_type; - - - - - - alter table wx_energy_fees_0 drop column type; alter table wx_energy_fees_0 drop column bill_type; alter table wx_energy_fees_0 drop column is_public; @@ -259,6 +253,8 @@ create table wx_finance_fees_97 like wx_finance_fees; create table wx_finance_fees_98 like wx_finance_fees; create table wx_finance_fees_99 like wx_finance_fees; +drop table wx_finance_fees; + alter table wx_bill_action_0 drop column bill_type; alter table wx_bill_action_1 drop column bill_type; diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index c7dea130e..df4981e9a 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -489,12 +489,12 @@ ) - or + or or - or + or or )