Merge branch 'score_shop' into api_score_meger

jyy

2021-07-17 402bf977071dd04257493b1a38d9e85cca925ae4

 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);

}