From 31037e96240c14bab943e73f341c259a8322a9a1 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Thu, 11 Mar 2021 19:46:52 +0800 Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop --- zq-erp/src/main/java/com/matrix/system/hive/statistics/AchieveAction.java | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/hive/statistics/AchieveAction.java b/zq-erp/src/main/java/com/matrix/system/hive/statistics/AchieveAction.java index 8d5d0f9..7f452ad 100644 --- a/zq-erp/src/main/java/com/matrix/system/hive/statistics/AchieveAction.java +++ b/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); }); -- Gitblit v1.9.1