From 40a2a789bee7a8963b27fe37a84b5a10757cb8b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 11 Sep 2019 17:00:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=8F=8F=E8=BF=B0?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java | 2 +- .../java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java index 3b7894c..77b0134 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java @@ -25,7 +25,7 @@ public class BsSuitCaseModel implements Serializable { private BsSuitCase bsSuitCase; @ApiParam(value = "数据源适配套件") - private BsSuitCaseDataSource bsDataSourceSuitCase; + private BsSuitCaseDataSource bsSuitCaseDataSource; @ApiParam(value = "socket适配套件") private BsSocketSuitCase bsSocketSuitCase; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index 71d1c59..9377c97 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java @@ -116,7 +116,6 @@ public class SoftSwitchHqlPack { DdlPreparedPack.getNumEqualPack(bsParamAdapter.getSuitCaseId(),"suitCaseId",ddlPackBean); DdlPreparedPack.getStringEqualPack(bsParamAdapter.getSuitCaseCode(),"suitCaseCode",ddlPackBean); - DdlPreparedPack.getStringLikerPack(bsParamAdapter.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsParamAdapter.getSuitParamNameRdd(), "suitParamNameRdd", ddlPackBean); DdlPreparedPack.getNumEqualPack(bsParamAdapter.getSuitParamTypeId(), "suitParamTypeId", ddlPackBean); From 59569cef66185f6fc97a6602067788f373ce1762 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 12 Sep 2019 15:01:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=8D=95=E4=B8=BB?= =?UTF-8?q?=E8=A1=A8=E5=8E=BB=E6=8E=89=E4=B9=90=E8=A7=82=E9=94=81=EF=BC=88?= =?UTF-8?q?=E5=A4=84=E7=90=86=E9=94=99=E8=AF=AF=E7=A7=BB=E5=8A=A8=E5=8D=95?= =?UTF-8?q?JOB=E4=B8=80=E4=B8=AA=E4=BA=8B=E5=8A=A1=E5=86=85=E5=AF=B9?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E8=A1=A8=E8=BF=9B=E8=A1=8C=E4=BA=86=E4=B8=A4?= =?UTF-8?q?=E6=AC=A1=E6=93=8D=E4=BD=9C=E4=B8=8D=E8=A1=8C=EF=BC=8C=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E7=A8=8B=E5=BA=8F=E7=9B=B4=E6=8E=A5=E6=8C=82=E6=8E=89?= =?UTF-8?q?=EF=BC=8C=E4=BA=8B=E5=8A=A1=E4=B9=9F=E6=B2=A1=E5=9B=9E=E6=BB=9A?= =?UTF-8?q?=EF=BC=89+=20=E4=BA=A4=E6=98=93=E5=A4=84=E7=90=86=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=EF=BC=88=E5=87=BA=E5=85=A5=E7=A7=BB=E5=BA=93=EF=BC=89?= =?UTF-8?q?=EF=BC=9A=E5=BE=85=E5=85=A5=E5=BA=93=E7=9A=84=E5=8F=AF=E8=83=BD?= =?UTF-8?q?=E6=98=AF=E4=B8=8D=E5=90=88=E6=A0=BC=E7=9A=84+=20=E5=85=AC?= =?UTF-8?q?=E5=85=B1PDA=E7=BB=84=E4=BB=B6=E6=8A=9B=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=80=BC=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 0ffaeb3..08bd2ef 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -144,10 +144,10 @@ public class WmsMoveMaster extends BaseBean { @ApiParam(value = "设备编号") public String fixId; - @Version - @Column(name = "LOCK_VERSION") - @ApiParam(value = "乐观锁", example = "1") - public Integer lockVersion; +// @Version +// @Column(name = "LOCK_VERSION") +// @ApiParam(value = "乐观锁", example = "1") +// public Integer lockVersion; public WmsMoveMaster(){};