# Conflicts: # eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderDetailRepository.java # eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java
# Conflicts: # eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderDetailRepository.java # eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java