# Conflicts: # src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateInRecordMapper.java # src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbActivateInRecordServiceImpl.java # src/main/resources/mapper/TbActivateInRecordMapper.xml