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
7 years ago · 7ba903a430
parent e0f3118296
commit 7ba903a430
1 changed files with 2 additions and 2 deletions
--- 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;
 }