Merge branch 'feature-v4.12.0-dsx' into test

# Conflicts:
#	src/main/java/com/fdkankan/contro/vo/SceneEditControlsVO.java

src/main/java/com/fdkankan/contro/vo/SceneEditControlsVO.java

@@ -76,5 +76,7 @@ public class SceneEditControlsVO implements Serializable {
 
     private Integer showDrawTitle;
 
+    private Integer showTagshare;
+
 
 }