Merge remote-tracking branch 'origin/hive2.0' into hive2.0

935090232@qq.com

2021-02-05 1e1282e8ed0385a1bc88d82dbd9bbcf5d1d22ece

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

@@ -154,7 +154,7 @@


    @Override
    public void addAchieveByServiceOrder(SysProjServices projServices) {
    public void     addAchieveByServiceOrder(SysProjServices projServices) {
        List<AchieveNew> achieveNewList = new ArrayList<>();
        List<SysBeauticianState> beauticianStateList = sysBeauticianStateDao.selectBySerIds(projServices.getId());
        int size = beauticianStateList.size();