Merge branch 'master' of http://192.168.0.115:3000/lyhzzz/4dkankan-center-user

src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -102,7 +102,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     private ISceneUpgradeMapper sceneUpgradeMapper;
 
     @Autowired
-    private ISurveillanceService surveillanceService;
+    private IInnerService innerService;
 
     @Value("${main.url}")
     private String mainUrl;
@@ -869,6 +869,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             infoVo.setBgMusicName(null);
             infoVo.setBgMusic(null);
         }
+        infoVo.setVersion(innerService.getSceneNumVersion(num));
         this.updateViewCount(num);
         return infoVo;
     }

src/main/java/com/fdkankan/ucenter/vo/response/SceneInfoVo.java

@@ -30,7 +30,7 @@ public class SceneInfoVo {
     private Integer thumbImg;
 
     /**"版本", name = "version*/
-    private Integer version;
+    private String version;
 
     /**"0表示默认，user表示自己上传", name = "markerLogo*/
     private String markerLogo;