fix conflect

wzy

2021-11-11 8f7460c6ddff45ec39bf2026d75a3f4e2b26f13d

 zq-erp/src/main/java/com/matrix/system/hive/service/SysOrderService.java

@@ -12,6 +12,7 @@
import org.springframework.transaction.annotation.Transactional;

import javax.servlet.http.HttpSession;
import java.math.BigDecimal;
import java.util.List;

/**
@@ -142,5 +143,6 @@

   List<RankingVo> findApiShopAchieveRanking(SysOrder sysOrder);

   List<RankingVo> findStaffSaleAchieveRanking(SysOrder sysOrder);
   BigDecimal findVipArrearsByVipId(Long vipId);

}