From 709a4a10be56952ead6340e4822fce41a66e47cd Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 26 七月 2023 18:39:28 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/SuperSaveDriving into dev
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBillController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBillController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBillController.java
index 2f349fb..6c00995 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBillController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBillController.java
@@ -84,8 +84,9 @@
@RequestMapping(value = "/list")
@ResponseBody
public Object list(String createTime,String addresseePhone,Integer state,Integer billType,Integer billHeaderType) {
- EntityWrapper<TBill> wrapper = tBillService.getPageListWrapper(createTime,addresseePhone,state,billType,billHeaderType);
- return tBillService.selectList(wrapper);
+// EntityWrapper<TBill> wrapper = tBillService.getPageListWrapper(createTime,addresseePhone,state,billType,billHeaderType);
+// return tBillService.selectList(wrapper);
+ return tBillService.getPageList(createTime,addresseePhone,state,billType,billHeaderType);
}
/**
--
Gitblit v1.7.1