Merge branch 'hotfix-49436' into test

# Conflicts:
#	src/main/java/com/fdkankan/scene/entity/ScenePlusExt.java

src/main/java/com/fdkankan/scene/entity/ScenePlusExt.java

@@ -180,6 +180,9 @@ public class ScenePlusExt implements Serializable {
     @TableField("is_obj")
     private Integer isObj;
 
+    @TableField("location")
+    private Integer location;
+
     /**
      * 图标大小（拜城公安需求）
      */