Merge remote-tracking branch 'origin/developer' into developer

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/CustomThemeServiceImpl.java

@@ -39,6 +39,6 @@ public class CustomThemeServiceImpl implements CustomThemeService {
         if(CollectionUtils.isNotEmpty(list)){
             return list.get(0).getTheme();
         }
-        return 0;
+        return 1;
     }
 }

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/vo/CustomStoreVO.java

@@ -38,4 +38,12 @@ public class CustomStoreVO {
     public void setAppType(Integer appType) {
         this.appType = appType;
     }
+
+    public Integer getStoreWidgetId() {
+        return storeWidgetId;
+    }
+
+    public void setStoreWidgetId(Integer storeWidgetId) {
+        this.storeWidgetId = storeWidgetId;
+    }
 }