Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0

5 years ago · 9d5bfc5ef2
parent 75d3e87f89 e3ef73e7e3
commit 9d5bfc5ef2
2 changed files with 1 additions and 7 deletions
--- a/Application/Admin/Controller/BehaviorLogController.class.php
+++ b/Application/Admin/Controller/BehaviorLogController.class.php
@ -111,9 +111,7 @@ class BehaviorLogController extends ThinkController
            $map['tab_repair_pay.type'] = $params['type'];
        }

-        if(isset($params['type'])) {
-            $map['tab_spend.extend'] = $params['extend'];
-        }
+

        if(isset($params['pay_order_number'])) {
            $map['tab_repair_pay.pay_order_number'] = $params['pay_order_number'];
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@ -2169,10 +2169,6 @@ class ExportController extends Controller
                                $map['tab_repair_pay.create_time'] = array('BETWEEN', [$startTime, $endTime]);
                            }

-                            if(isset($params['type'])) {
-                                $map['tab_spend.extend'] = $params['extend'];
-                            }
-
                            if(isset($params['type'])) {
                                $map['tab_repair_pay.type'] = $params['type'];
                            }