confict

Helius

2021-02-03 fed1f885b03a5b4b7c62d44320c3ff2068ca02e6

 zq-erp/src/main/java/com/matrix/system/hive/statistics/AchieveAction.java

@@ -163,6 +163,7 @@
                if (achieveNew.getOrderItemId().equals(item.getId())) {
                    achieveNewList.add(achieveNew);
                }

            }
            item.setAchaeveList(achieveNewList);
        });