# Conflicts: # dal/src/main/resources/META-INF/mybatis/BuyerOrderMapper.xml
This reverts commit 94c73015.