From 428f98955d47e19d5e5c29813d818ee66bda8019 Mon Sep 17 00:00:00 2001 From: yumingxing <1184315279@qq.com> Date: Mon, 18 Jan 2021 18:46:53 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8A=A5=E8=A1=A820210118?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/model/report/ConditionQueryModel.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ConditionQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ConditionQueryModel.java index 4aece80..22f0883 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ConditionQueryModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ConditionQueryModel.java @@ -25,10 +25,10 @@ public class ConditionQueryModel { private String customerPartNo; @ApiParam("开始时间") - private String modifyStartTime; + private String modifyStartDate; @ApiParam("结束时间") - private String modifyEndTime; + private String modifyEndDate; @ApiParam("零件二维码") private String serialNumber; From 3997ae3e9327d6a10cc331aaf3ba420f52767888 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 19 Jan 2021 13:57:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90=E6=8E=92=E5=BA=8F=E5=BA=8F?= =?UTF-8?q?=E5=8F=B7--=E6=BB=91=E9=81=93=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 6386a1b..655282d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -207,6 +207,10 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam(value = "乐观锁", example = "1") public Integer lockVersion; + @Column(name = "SORT_SEQ") + @ApiParam("排序序号") + private String SORT_SEQ; + /********************** 冗余字段 *********************************/ @Transient @ApiParam(value = "工作中心名称") From d8aac51ef596d96148cef2d155afccab15e958eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 19 Jan 2021 14:01:12 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90=E6=8E=92=E5=BA=8F=E5=BA=8F?= =?UTF-8?q?=E5=8F=B7--=E6=BB=91=E9=81=93=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 655282d..57fe9f5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -209,7 +209,7 @@ public class MesWorkOrder extends BaseBean implements Serializable { @Column(name = "SORT_SEQ") @ApiParam("排序序号") - private String SORT_SEQ; + private String sortSeq; /********************** 冗余字段 *********************************/ @Transient