Merge remote-tracking branch 'origin/master'

cuilei

3 天以前 86565eefc5c2fa9be6a00db58d1079c6d0d908ac

 src/main/java/org/jeecg/modules/lsw/mapper/LswMaterialInventoryMapper.java

@@ -18,7 +18,8 @@
public interface LswMaterialInventoryMapper extends BaseMapper<LswMaterialInventory> {

    List<LswMaterialInventoryVo> selectLineSideMaterialInventoryByMaterialNumber(@Param("materialNumberList") List<String> bomMaterialNumberList,
                                                             @Param("factoryId") String factoryId);
                                                             @Param("factoryId") String factoryId,
                                                             @Param("heatFlag") String heatFlag);

   /**
    * 库存统计