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

# Conflicts:
#	src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -624,6 +624,8 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
             controls.setShowRule(CommonStatus.NO.code().intValue());
         }
 
+        sceneInfoVO.setPayStatus(scenePlus.getPayStatus());
+
         return sceneInfoVO;
     }
 

src/main/java/com/fdkankan/scene/vo/SceneInfoVO.java

@@ -262,5 +262,7 @@ public class SceneInfoVO {
     //动态面板
     private int dynamicPanel;
 
+    private Integer payStatus;
+
 
 }