From 86930d96673ddfeae531c89bc9fc2136e4448d9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sun, 18 Jul 2021 18:20:34 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E4=BA=A7=E5=93=81=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=85=B3=E8=81=94=E5=85=B3=E7=B3=BB=E8=A1=A8=20?= =?UTF-8?q?=E7=94=9F=E6=88=90=E8=BF=AD=E4=BB=A3=E4=B8=8E=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E5=85=B3=E8=81=94=E5=85=B3=E7=B3=BB=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xm/core/ctrl/XmIterationProductLinkController.java | 9 +++------ .../com/xm/core/ctrl/XmProductProjectLinkController.java | 8 ++------ 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmIterationProductLinkController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmIterationProductLinkController.java index 4d63a0da..5d8e08fa 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmIterationProductLinkController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmIterationProductLinkController.java @@ -74,7 +74,7 @@ public class XmIterationProductLinkController { - /** + @ApiOperation( value = "新增一条迭代表与产品表的关联关系，一般由迭代管理员将迭代挂接到产品表信息",notes=" ") @ApiResponses({ @ApiResponse(code = 200,response=XmIterationProductLink.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") @@ -95,7 +95,7 @@ public class XmIterationProductLinkController { } if(createPk==false){ if(xmIterationProductLinkService.selectOneObject(xmIterationProductLink) !=null ){ - tips.setFailureMsg("编号重复，请修改编号再提交"); + tips.setFailureMsg("该产品已经在迭代中，无需再添加"); m.put("tips", tips); return m; } @@ -112,9 +112,7 @@ public class XmIterationProductLinkController { m.put("tips", tips); return m; } - */ - - /** + @ApiOperation( value = "删除一条迭代表与产品表的关联关系，一般由迭代管理员将迭代挂接到产品表信息",notes=" ") @ApiResponses({ @ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}}") @@ -135,7 +133,6 @@ public class XmIterationProductLinkController { m.put("tips", tips); return m; } - */ /** @ApiOperation( value = "根据主键修改一条迭代表与产品表的关联关系，一般由迭代管理员将迭代挂接到产品表信息",notes=" ") diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProductProjectLinkController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProductProjectLinkController.java index d03fe7a6..e121341e 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProductProjectLinkController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProductProjectLinkController.java @@ -73,8 +73,7 @@ public class XmProductProjectLinkController { } - - /** + @ApiOperation( value = "新增一条产品与项目的关联关系表，一般由产品经理挂接项目到产品上信息",notes=" ") @ApiResponses({ @ApiResponse(code = 200,response=XmProductProjectLink.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") @@ -108,9 +107,7 @@ public class XmProductProjectLinkController { m.put("tips", tips); return m; } - */ - - /** + @ApiOperation( value = "删除一条产品与项目的关联关系表，一般由产品经理挂接项目到产品上信息",notes=" ") @ApiResponses({ @ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}}") @@ -131,7 +128,6 @@ public class XmProductProjectLinkController { m.put("tips", tips); return m; } - */ /** @ApiOperation( value = "根据主键修改一条产品与项目的关联关系表，一般由产品经理挂接项目到产品上信息",notes=" ")