[合同][修改][开发账单结算]

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冻结';
+

mallinkService/src/main/resources/mapper/WxBillAllMapper.xml

@@ -741,7 +741,6 @@
 		<if test=" null != merchantName"> and m.name like concat('%', #{merchantName},'%') </if>
 		<if test=" null != rentShopType"> and rc.rent_shop_type = #{rentShopType} </if>
 
-
 		<if test=" null != sortColumns"> order by ${sortColumns} </if>
 		<if test=" null == sortColumns"> order by m.id desc </if>
 	</select>