From bbcd0c8f695ee2e78c09352b5512c89da7ba506b Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Tue, 25 Aug 2020 13:42:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 39932c2..7e2af1b 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -2591,7 +2591,7 @@ public class MesPcnEnumUtil { RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean"), PROCESS_CONTENT("processContent", "过程组件内容"), TIME_MODULE_CONTENT("timeModuleContent", "定时组件内容"), - TIME_MODULE_INIT("timeModuleInit", "初始化时间展示组件"), +// TIME_MODULE_INIT("timeModuleInit", "初始化时间展示组件"), TIME_MODULE_START("timeModuleStart", "定时组件开始"), TIME_MODULE_STOP("timeModuleStop", "定时组件暂停"), TIME_MODULE_INIT("timeModuleInit", "初始化时间展示组件"); From 53d392ebe118b71f56c8ffd49cfca12aa3f3ef5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 25 Aug 2020 16:07:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B5=B7=E7=BA=B3=E5=B7=9D=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D=E6=9E=AA=E5=A4=B4=E6=9B=B4=E6=8D=A2?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BC=B9=E6=A1=86=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/model/TorqueHeadChangeModel.java | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueHeadChangeModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueHeadChangeModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueHeadChangeModel.java new file mode 100644 index 0000000..ada9108 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueHeadChangeModel.java @@ -0,0 +1,32 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author adair.song + * @date 2020/6/16 14:21 + * @desc 枪头更换计数弹框model + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("枪头更换计数弹框model") +public class TorqueHeadChangeModel { + + @ApiParam(name = "确认密码") + private String passWord; + + @ApiParam(name = "工厂") + private String organizeCode; + + @ApiParam(name = "工作中心") + private String workCenterCode; + + @ApiParam(name = "工作单元") + private String workCellCode; + +}