diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java
index 0bc9ae858..5c0866c96 100644
--- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java
+++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java
@@ -183,7 +183,7 @@ public class WxFinanceController extends BaseController {
@ApiOperation("查询冲抵列表")
@PostMapping("setoffList")
- public ResultData setoffList(@ModelAttribute FinanceSetOffDTO dto) {
+ public ResultData setoffList(@RequestBody FinanceSetOffDTO dto) {
dto.updateTenantInfo(getTenantInfo());
return new ResultData(wxFinanceService.getSetOffList(dto,true));
}
diff --git a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml
index 0e1dbb2b7..85dfd9705 100644
--- a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml
@@ -39,10 +39,12 @@
+
+
- `id`,`tenant_id`,`parent_tenant_id`,`rent_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`last_owe_call_time`,`set_off`,
+ `id`,`tenant_id`,`parent_tenant_id`,`rent_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`last_owe_call_time`,`set_off`,`starttime`,`endtime`,
`expired_day`,`status`,`is_del`,`need_pay`,`merchant_id`,`user_id`,`shop_id`,`updatetime`,`apply_status`,`apply_pay_img`,`apply_update_time`,`energy_fees_id`,
`last_owe_call_user`,`rent_shop_type`,`return_price`,`pay_way`,service_charge_pay,contract_depoist_detail,`create_by`,`create_by_name`,`update_by`,`update_by_name`
@@ -135,7 +137,8 @@