Merge branch 'release-copyscene' into test

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

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

@@ -191,4 +191,7 @@ public class ScenePlusExt implements Serializable {
 
     @TableField("has_recognition")
     private Integer hasRecognition;
+    @TableField("location")
+    private Integer location;
+
 }