# Conflicts: # zi-wms-pda/src/main/java/com/cim/idm/service/Impl/ProductIntoServiceImpl.java
2. 整合mybatis 3. 重写更新物料凭证 4. Map工具类封装