Merge remote-tracking branch 'origin/master'

于杰

2025-08-29 6b6f3fbd333894209e0df1822ff89881aa4319fe

 north-glass-erp/src/main/java/com/example/erp/mapper/mm/BasicWarehouseTypeMapper.java

@@ -20,7 +20,7 @@

    List<String> getBasicWarehouse(String type);

    List<BasicWarehouseType> getBasicWarehouseTypeAll();
    List<BasicWarehouseType> getBasicWarehouseTypeAll(String originalFilm,String accessories);

    Boolean insertBasicWarehouse(@Param("operateTypeName") String operateTypeName,
                                 @Param("operateType") String operateType,
@@ -30,5 +30,7 @@

    Boolean updateBasicWarehouse(@Param("id") Long id,@Param("operateTypeName") String operateTypeName);

    List<String> getBasicWarehouseUser(String type);


}