Merge remote-tracking branch 'origin/qjkk-webSite'

src/main/java/com/fdkankan/ucenter/vo/request/AppSceneParam.java

@@ -34,5 +34,9 @@ public class AppSceneParam extends RequestBase {
     private String sceneNum;
 
     private Set<String> copyNumSet;
+    /**
+     * 是否是文保App
+     */
+    private Boolean queryVrPano = false;
 
 }

src/main/resources/mapper/ucenter/ScenePlusMapper.xml

@@ -56,6 +56,9 @@
         FROM t_scene_plus p
         LEFT JOIN t_scene_plus_ext e on p.id = e.plus_id
         <include refid="commonWhere"></include>
+        <if test="param.queryVrPano !=null and param.queryVrPano == false">
+            and  e.location  != 7
+        </if>
         AND ( p.scene_status = 1 OR p.scene_status = -2)
         <if test="param.sceneName !=null and param.sceneName !=''">
             and  p.title like CONCAT('%',#{param.sceneName},'%')