Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer

# Conflicts:
#	gic-store-web/src/main/java/com/gic/store/web/controller/StoreController.java

gic-store-web/src/main/java/com/gic/store/web/vo/StoreDictVO.java

@@ -83,4 +83,12 @@ public class StoreDictVO implements Serializable {
         }
         return "";
     }
+
+    public Integer getIsSystem() {
+        return isSystem;
+    }
+
+    public void setIsSystem(Integer isSystem) {
+        this.isSystem = isSystem;
+    }
 }
\ No newline at end of file