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

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/GoblinFrontBannerBuildParam.java

@@ -44,7 +44,7 @@ public class GoblinFrontBannerBuildParam implements Serializable {
     /**
      * 1、票务2、H5
      */
-    @ApiModelProperty(value = "1、票务2、H5")
+    @ApiModelProperty(value = "1、票务2、H5、3商品")
     private String jumpType;
 
     /**

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/homeSet/kingArea.html

@@ -190,6 +190,7 @@
                         } else {
                             $('#optionsRadios2').attr('checked', true)
                             $('#optionsRadios1').removeAttr('checked')
+                            hang = 2
                         }
                     }
                     if (hang == data[0].displayType) {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/service/impl/GoblinFrontBannerServiceImpl.java

@@ -169,12 +169,9 @@ public class GoblinFrontBannerServiceImpl extends ServiceImpl<GoblinFrontBannerM
                     );
                 }
             }
+        }
         //redis
         redisDataSourceUtil.getRedisGoblinUtil().set(GoblinRedisConst.FRONT_TOP_BANNER,list);
-            //中部
-
-        }
-
         return true;
     }
     public boolean middle(){