From 3539379a9409ded6110f24460592186aab80a8cb Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 23 八月 2024 17:10:08 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TGoodsServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TGoodsServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TGoodsServiceImpl.java
index 7372668..7a58640 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TGoodsServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TGoodsServiceImpl.java
@@ -1,5 +1,6 @@
package com.ruoyi.other.service.impl;
+import com.ruoyi.common.core.dto.AppGoodQuery;
import com.ruoyi.common.core.web.page.BasePage;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.order.api.feignClient.OrderClient;
@@ -57,14 +58,14 @@
return pageInfo;
}
@Override
- public PageInfo<TGoods> pageList1(BasePage basePage) {
+ public PageInfo<TGoods> pageList1(AppGoodQuery basePage) {
GoodsDTO dto = new GoodsDTO();
dto.setType(2);
dto.setStatus(1);
dto.setPageCurr(basePage.getPageCurr());
dto.setPageSize(basePage.getPageSize());
PageInfo<TGoods> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize());
- List<TGoods> list = this.baseMapper.pageList1(pageInfo);
+ List<TGoods> list = this.baseMapper.pageList1(pageInfo,basePage);
StringBuilder stringBuilder = new StringBuilder();
for (TGoods temp : list) {
--
Gitblit v1.7.1