diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java index cf31e92af4..c218d0e95b 100644 --- a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java +++ b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java @@ -150,8 +150,8 @@ public class TestPlanService { if (!StringUtils.isBlank(testPlan.getStatus())) { BeanUtils.copyBean(testPlans, getTestPlan(testPlan.getId())); String context = getTestPlanContext(testPlans, NoticeConstants.Event.UPDATE); - User user = userMapper.selectByPrimaryKey(testPlan.getCreator()); - Map paramMap = getTestPlanParamMap(testPlan); + User user = userMapper.selectByPrimaryKey(testPlans.getCreator()); + Map paramMap = getTestPlanParamMap(testPlans); paramMap.put("creator", user.getName()); NoticeModel noticeModel = NoticeModel.builder() .context(context) @@ -533,8 +533,8 @@ public class TestPlanService { try { BeanUtils.copyBean(_testPlans, testPlans); String context = getTestPlanContext(_testPlans, NoticeConstants.Event.UPDATE); - User user = userMapper.selectByPrimaryKey(testPlan.getCreator()); - Map paramMap = getTestPlanParamMap(testPlan); + User user = userMapper.selectByPrimaryKey(_testPlans.getCreator()); + Map paramMap = getTestPlanParamMap(_testPlans); paramMap.put("creator", user.getName()); NoticeModel noticeModel = NoticeModel.builder() .context(context) diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack index 61397c1672..b5643ac73f 160000 --- a/backend/src/main/java/io/metersphere/xpack +++ b/backend/src/main/java/io/metersphere/xpack @@ -1 +1 @@ -Subproject commit 61397c16728a63493507679f7e0940d9099f337f +Subproject commit b5643ac73fb4a2db3f11b23a81848990d8e78703 diff --git a/frontend/src/business/components/settings/project/MsProject.vue b/frontend/src/business/components/settings/project/MsProject.vue index 99c2821329..213a237372 100644 --- a/frontend/src/business/components/settings/project/MsProject.vue +++ b/frontend/src/business/components/settings/project/MsProject.vue @@ -273,6 +273,7 @@ export default { diff --git a/frontend/src/business/components/settings/project/Project.vue b/frontend/src/business/components/settings/project/Project.vue deleted file mode 100644 index c34932220e..0000000000 --- a/frontend/src/business/components/settings/project/Project.vue +++ /dev/null @@ -1,26 +0,0 @@ - - - - - diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack index d39dafaf84..010ad7a5f0 160000 --- a/frontend/src/business/components/xpack +++ b/frontend/src/business/components/xpack @@ -1 +1 @@ -Subproject commit d39dafaf84b9c7a56cb51f2caf67dd7dfde5938c +Subproject commit 010ad7a5f072a5e9d368c756a2473bbd20781433