From 10939f8087afa6b45eda814bddcf8047813f66c3 Mon Sep 17 00:00:00 2001 From: Silliter Date: Mon, 10 Dec 2018 10:45:23 +0800 Subject: [PATCH] Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test # Conflicts: # modules/i3plus-pojo-base/pom.xml # modules/i3plus-pojo-mes/pom.xml # modules/i3plus-pojo-model/pom.xml # modules/i3plus-pojo-platform/pom.xml # modules/i3plus-pojo-wms/pom.xml # pom.xml --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java index c466a30..601953a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java @@ -18,7 +18,7 @@ import javax.persistence.Table; * @Author : hansen.ke * @CreateDate : 2018-11-28 15:20 * @Modify: - * 2018-12-10 10:39:46 + * 2018-12-10 10:39:46 Test **/ @Data @Entity