From 7ba903a4302cf1cc98526a94058cc7b5d4cd87a1 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Mon, 10 Dec 2018 10:27:25 +0800 Subject: [PATCH] Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-wms into test # Conflicts: # modules/i3plus-wms-api/pom.xml # modules/i3plus-wms-apiservice/pom.xml # pom.xml --- .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysFactoryStore.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFactoryStore.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFactoryStore.java index dcfe3bd..814ba4f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFactoryStore.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFactoryStore.java @@ -29,9 +29,9 @@ public class SysFactoryStore extends BaseBean { @Column(name="store_code") @ApiParam("仓库代码") - public String storeCode; + private String storeCode; @Column(name="store_name") @ApiParam("仓库名称") - public String storeName; + private String storeName; }