Merge remote-tracking branch 'origin/master'

xuhy

2025-10-14 0d83a54d5f3ae08fe0ee4b3cd3fd72e94e2767e1

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

@@ -8,6 +8,7 @@
import com.ruoyi.system.dto.InventoryGoodsDto;
import com.ruoyi.system.model.TErpGoods;
import com.ruoyi.system.query.TClinicGoodsWarehouseQuery;
import com.ruoyi.system.query.TErpGoodsAdminQuery;
import com.ruoyi.system.query.TErpGoodsInventoryQuery;
import com.ruoyi.system.query.TErpGoodsQuery;
import com.ruoyi.system.vo.OutboundGoodsDetailVo;
@@ -75,4 +76,7 @@
    PageInfo<TErpGoodsVO> pageList1(TErpGoodsQuery query, SysUser user);


    PageInfo<TErpGoodsVO> pageAdminList(TErpGoodsAdminQuery query);


}