Merge branch 'dev-v4.2.0-20220519' into test

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneUpgradeToV4Service.java

@@ -112,9 +112,11 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
                     redisLockUtil.unlockLua(lockKey);
                     return ResultData.error(ErrorCode.FAILURE_CODE_7019);
                 }
-                if(sceneRepairLog.getState() == 1){
-                    redisLockUtil.unlockLua(lockKey);
-                    return ResultData.error(ErrorCode.FAILURE_CODE_7020);
+                if(!param.isReUpgrade()){
+                    if(sceneRepairLog.getState() == 1){
+                        redisLockUtil.unlockLua(lockKey);
+                        return ResultData.error(ErrorCode.FAILURE_CODE_7020);
+                    }
                 }
             }