Conflicts: src/main/java/com/goafanti/common/dao/CustomerMapper.java src/main/java/com/goafanti/customer/bo/CustomerBo.java src/main/java/com/goafanti/customer/service/CustomerService.java src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java