# Conflicts: # coolstore-partner-model/src/main/java/com/cool/store/dto/FranchiseFeeDTO.java # coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java
# Conflicts: # coolstore-partner-model/src/main/java/com/cool/store/dto/FranchiseFeeDTO.java # coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java