Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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;

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);
 

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(){};