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

jyy

2021-04-20 f50e081f650eb067cce44fce3db64a237fde145b

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

}