Merge remote-tracking branch 'origin/master'

石广澎

2024-01-02 48ef443170ee0cc12268bda0c686ffbd1d81671c

 consum-base/src/main/java/com/consum/base/service/BaseWarehouseService.java

@@ -49,13 +49,5 @@
     */
    List<BaseWarehouse> getBaseWareHouseList(Long agencyId, Integer states);

    /**
     * 根据机构id查询默认仓库
     *
     * @param agencyId
     * @return
     */
    BaseWarehouse getDefaultWarehouseByAgencyId(Long agencyId);

    BaseWarehouse getWarehouseByAgencyId(Long agencyId, String warehouseName);
}