Merge remote-tracking branch 'origin/dev' into dev

xuhy

2 天以前 bd1e1c6a99c228ece8ece17be462b81d5494c7a1

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TGoodsService.java

@@ -1,6 +1,7 @@
package com.ruoyi.other.service;

import com.baomidou.mybatisplus.extension.service.IService;
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.other.api.domain.TGoods;
@@ -17,6 +18,6 @@
public interface TGoodsService extends IService<TGoods> {

    PageInfo<TGoods> pageList(GoodsDTO dto);
    PageInfo<TGoods> pageList1(BasePage basePage);
    PageInfo<TGoods> pageList1(AppGoodQuery appGoodQuery);

}