Merge branch 'hotfix-4.1.0.1-20220726' into release

# Conflicts:
#	src/main/java/com/fdkankan/repair/service/impl/SceneUpgradeToV4Service.java

src/main/java/com/fdkankan/repair/bean/SceneJsonBean.java

@@ -1,6 +1,7 @@
 package com.fdkankan.repair.bean;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotation.TableField;
 import java.util.Date;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -88,6 +89,16 @@ public class SceneJsonBean {
      */
     private Integer version;
 
+    /**
+     * 版本
+     */
+    private Integer imgVersion;
+
+    /**
+     * 版本
+     */
+    private Integer linkVersion;
+
 //    /**
 //     * 户型图文件路径集合
 //     */

src/main/java/com/fdkankan/repair/entity/SceneEditInfo.java

@@ -103,6 +103,18 @@ public class SceneEditInfo implements Serializable {
     private Integer version;
 
     /**
+     * 版本
+     */
+    @TableField("img_version")
+    private Integer imgVersion;
+
+    /**
+     * 版本
+     */
+    @TableField("link_version")
+    private Integer linkVersion;
+
+    /**
      * 是否上传模型
      */
     @TableField("is_upload_obj")

src/main/java/com/fdkankan/repair/service/impl/SceneUpgradeToV4Service.java

@@ -263,8 +263,13 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
 
                 sceneEditInfo.setTitle(scenePro.getSceneName());
                 sceneEditInfo.setVersion(sceneEditInfo.getVersion() + 1);
-                //如果是重算升级，需要重置平面图标识为否
                 if(reUpgrade){
+                }
+
+                if(reUpgrade){
+                    //场景重算再掉的升级时，需要把imgVersion累加
+                    sceneEditInfo.setImgVersion(sceneEditInfo.getImgVersion() + 1);
+                    //如果是重算升级，需要重置平面图标识为否
                     sceneEditInfo.setFloorPlanUser(CommonStatus.NO.code().intValue());
                 }
                 sceneEditInfoService.updateById(sceneEditInfo);