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

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/goblin/GoblinFrontCompilationsController.java

@@ -49,6 +49,8 @@ public class GoblinFrontCompilationsController extends BaseController {
     public AjaxResult goodsList(@RequestParam(name = "name", required = false) String name) {
         LambdaQueryWrapper<GoblinGoods> queryWrapper = Wrappers.lambdaQuery(GoblinGoods.class);
         queryWrapper.ne(GoblinGoods::getDelFlg,"1");
+        queryWrapper.eq(GoblinGoods::getShelvesStatus,"3");
+        queryWrapper.eq(GoblinGoods::getSpuAppear,"0");
         if(StringUtil.isNotBlank(name)){
             queryWrapper.like(GoblinGoods::getName,name);
         }