Merge branch 'developer'

姜友瑶

2022-05-30 d7b7ccaac1d84ecd1934eab97c0fef57bd2a847d

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

@@ -6,6 +6,7 @@
import com.matrix.system.hive.bean.SysOrder;
import com.matrix.system.hive.bean.SysProjServices;
import com.matrix.system.hive.plugin.util.BaseServices;
import com.matrix.system.hive.vo.DailyBeautyListVo;

import java.util.List;
import java.util.Map;
@@ -117,4 +118,7 @@

   public List<AchieveNew> findOrderItemAchieve(Long orderid);

   List<DailyBeautyListVo> findDailyBeautyList(AchieveNew achieveNew, PaginationVO pageVo);
   int findDailyBeautyListTotal(AchieveNew achieveNew);

}