Merge remote-tracking branch 'origin/master'

xuhy

10 天以前 49dd9ee3dea22203cd1a0cc53745cffb6607122c

 ruoyi-system/src/main/java/com/ruoyi/system/service/TErpGoodsService.java

@@ -7,9 +7,7 @@
import com.ruoyi.system.dto.InventoryDto;
import com.ruoyi.system.dto.InventoryGoodsDto;
import com.ruoyi.system.model.TErpGoods;
import com.ruoyi.system.query.TClinicGoodsWarehouseQuery;
import com.ruoyi.system.query.TErpGoodsInventoryQuery;
import com.ruoyi.system.query.TErpGoodsQuery;
import com.ruoyi.system.query.*;
import com.ruoyi.system.vo.OutboundGoodsDetailVo;
import com.ruoyi.system.vo.TErpGoodsInventoryVO;
import com.ruoyi.system.vo.TErpGoodsVO;
@@ -72,4 +70,12 @@
    OutboundGoodsDetailVo outboundGoodsDetail(String id);


    PageInfo<TErpGoodsVO> pageList1(TErpGoodsQuery query, SysUser user);


    PageInfo<TErpGoodsVO> pageAdminList(TErpGoodsAdminQuery query);


    List<TErpGoods> pageAddList(Page<TErpGoods> tErpGoodsPage, String clinicSupplierId, PageAddListQuery query);

}