dd

laowubao/app/base/service/impl/operator/taxinfoSve.js

@@ -63,20 +63,10 @@ class TaxinfoService extends ServiceBase {
             if (total === 0) {
             if (total === 0) {
                 return {count: 1, rows: []};
                 return {count: 1, rows: []};
             }
             }
-<<<<<<< HEAD
-            where.user_id = this.trim(params.userId);
-            var orderby = [
-                ["id", 'desc']
-            ];
-            var page = await this.getPageList(currentPage, pageSize, where, orderby);
-            if (page && page.rows) {
-                for (var row of page.rows) {
-=======
             params.startRow = (params.currentPage - 1) * params.pageSize;
             params.startRow = (params.currentPage - 1) * params.pageSize;
             let list = await this.dao.pageByUser(params);
             let list = await this.dao.pageByUser(params);
             if (list) {
             if (list) {
                 for (var item of list) {
                 for (var item of list) {
->>>>>>> 026b3250eae45a614a582ab7662754f26ca7b0cd
                     this.handleDate(row, ["tax_time"],null,-8);
                     this.handleDate(row, ["tax_time"],null,-8);
                 }
                 }
             }
             }