Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-03-25 5857fd14f4608ace25724ba6386d72d210e20870

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

@@ -115,4 +115,6 @@

   public UserAchieveVo findUserAchieveByTime(int type);

   public List<AchieveNew> findOrderItemAchieve(Long orderid);

}